Changeset 21367

Timestamp:

07/30/2012 07:40:52 PM (14 years ago)

Author:

azaozz

Message:

TinyMCE: better exclusion of Opera mobile, fixes #21416

Location:

trunk/wp-includes

Files:

• general-template.php (modified) (1 diff)
• vars.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -1755 +1755 @@
                         if ( $is_safari ) {
                                 $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
-                        } elseif ( $is_gecko || $is_chrome || $is_IE ) {
+                        } elseif ( $is_gecko || $is_chrome || $is_IE || ( $is_opera && !wp_is_mobile() ) ) {
                                 $wp_rich_edit = true;
-                        } elseif ( $is_opera ) {
-                                if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi/') === false && strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini/') === false )
-                                        $wp_rich_edit = true;
                         }
                 }

trunk/wp-includes/vars.php

@@ -117 +117 @@
                 || strpos($_SERVER['HTTP_USER_AGENT'], 'Kindle') !== false
                 || strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false
-                || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false ) {
+                || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false
+                || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false ) {
                         $is_mobile = true;
         } else {