Changeset 20417 for trunk/wp-includes/general-template.php

Timestamp:

04/10/2012 01:19:30 AM (13 years ago)

Author:

azaozz

Message:

Introduce wp_is_mobile() and use it instead of $is_iphone global, see #20014

File:

• trunk/wp-includes/general-template.php (modified) (2 diffs)

trunk/wp-includes/general-template.php

@@ -1747 +1747 @@
  */
 function user_can_richedit() {
-    global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_iphone, $is_IE;
+    global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE;
 
     if ( !isset($wp_rich_edit) ) {
@@ -1754 +1754 @@
         if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users
             if ( $is_safari ) {
-                if ( $is_iphone || false !== strpos( $_SERVER['HTTP_USER_AGENT'], '; Silk/' ) )
+                if ( wp_is_mobile() || false !== strpos( $_SERVER['HTTP_USER_AGENT'], '; Silk/' ) )
                     $wp_rich_edit = ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
                 else