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

Let WebKit 420 or above get in. And clean up that overgrown ternary. Props Andy. fixes #4241 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rob1n 2007-05-10 01:31:12 +00:00
parent ece3623070
commit 58839706d0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
} }