Changes from trunk/wp-includes/general-template.php at r15227 to branches/3.0/wp-includes/general-template.php at r15461

File:

• branches/3.0/wp-includes/general-template.php (modified) (4 diffs)

branches/3.0/wp-includes/general-template.php

@@ -33 +33 @@
     // Backward compat code will be removed in a future release
     if ('' == locate_template($templates, true))
-        load_template( WPINC . '/theme-compat/header.php');
+        load_template( ABSPATH . WPINC . '/theme-compat/header.php');
 }
 
@@ -62 +62 @@
     // Backward compat code will be removed in a future release
     if ('' == locate_template($templates, true))
-        load_template( WPINC . '/theme-compat/footer.php');
+        load_template( ABSPATH . WPINC . '/theme-compat/footer.php');
 }
 
@@ -91 +91 @@
     // Backward compat code will be removed in a future release
     if ('' == locate_template($templates, true))
-        load_template( WPINC . '/theme-compat/sidebar.php');
+        load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php');
 }
 
@@ -1722 +1722 @@
  */
 function user_can_richedit() {
-    global $wp_rich_edit, $pagenow;
+    global $wp_rich_edit, $pagenow, $is_iphone;
 
     if ( !isset( $wp_rich_edit) ) {
         if ( get_user_option( 'rich_editing' ) == 'true' &&
+            !$is_iphone && // this includes all Safari mobile browsers
             ( ( 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'] ) )