WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update user_can_richedit to allow TinyMCE in iOS5, props markoheijnen, fixes #18626 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-10-13 06:37:24 +00:00
parent 32fa9f7d6c
commit 144a8ad8ce
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-includes/general-template.php
View File

@ -1713,17 +1713,18 @@ function rich_edit_exists() {
* @return bool * @return bool
*/ */
function user_can_richedit() { function user_can_richedit() {
global $wp_rich_edit, $pagenow, $is_iphone; global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_iphone, $is_IE;
if ( !isset( $wp_rich_edit) ) { if ( !isset( $wp_rich_edit) ) {
if ( get_user_option( 'rich_editing' ) == 'true' &&
!$is_iphone && // this includes all Safari mobile browsers
( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) ||
!preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) )
) {
$wp_rich_edit = true;
} else {
$wp_rich_edit = false; $wp_rich_edit = false;
if ( get_user_option( 'rich_editing' ) == 'true' ) {
if ( $is_safari ) {
if ( !$is_iphone || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 534 ) )
$wp_rich_edit = true;
} elseif ( $is_gecko || $is_opera || $is_chrome || $is_IE ) {
$wp_rich_edit = true;
}
} }
} }