WordPress.org

Make WordPress Core

Changeset 21367


Ignore:
Timestamp:
07/30/12 19:40:52 (5 years ago)
Author:
azaozz
Message:

TinyMCE: better exclusion of Opera mobile, fixes #21416

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/general-template.php

    r21361 r21367  
    17551755            if ( $is_safari ) { 
    17561756                $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 ); 
    1757             } elseif ( $is_gecko || $is_chrome || $is_IE ) { 
     1757            } elseif ( $is_gecko || $is_chrome || $is_IE || ( $is_opera && !wp_is_mobile() ) ) { 
    17581758                $wp_rich_edit = true; 
    1759             } elseif ( $is_opera ) { 
    1760                 if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi/') === false && strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini/') === false ) 
    1761                     $wp_rich_edit = true; 
    17621759            } 
    17631760        } 
  • trunk/wp-includes/vars.php

    r20990 r21367  
    117117        || strpos($_SERVER['HTTP_USER_AGENT'], 'Kindle') !== false 
    118118        || strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false 
    119         || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false ) { 
     119        || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false 
     120        || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false ) { 
    120121            $is_mobile = true; 
    121122    } else { 
Note: See TracChangeset for help on using the changeset viewer.