Changeset 5425

Timestamp:

05/10/2007 01:31:12 AM (18 years ago)

Author:

rob1n

Message:

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

File:

• trunk/wp-includes/general-template.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -810 +810 @@
 function user_can_richedit() {
     global $wp_rich_edit, $pagenow;
-
-    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 ( !isset( $wp_rich_edit) ) {
+        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);