Let WebKit 420 or above get in. And clean up that overgrown ternary. Props Andy. fixes #4241
git-svn-id: https://develop.svn.wordpress.org/trunk@5425 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
ea71ef4d71
commit
9abc3c9374
|
@ -810,8 +810,15 @@ function rich_edit_exists() {
|
||||||
function user_can_richedit() {
|
function user_can_richedit() {
|
||||||
global $wp_rich_edit, $pagenow;
|
global $wp_rich_edit, $pagenow;
|
||||||
|
|
||||||
if ( !isset($wp_rich_edit) )
|
if ( !isset( $wp_rich_edit) ) {
|
||||||
$wp_rich_edit = ( 'true' == get_user_option('rich_editing') && !preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) && 'comment.php' != $pagenow && rich_edit_exists() ) ? true : false;
|
if ( get_user_option( 'rich_editing' ) == 'true' &&
|
||||||
|
( ( 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return apply_filters('user_can_richedit', $wp_rich_edit);
|
return apply_filters('user_can_richedit', $wp_rich_edit);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue