Wordpress 3.0.3-scripts

[autoinstalls/wordpress.git] / wp-includes / general-template.php

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index b3712425d9d57d37c5b3ce73f2dd4123ea730d56..333d2642a7d61440c73e6a6083c879c71e309921 100644 (file)
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -32,7 +32,7 @@ function get_header( $name = null ) {
 
        // 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');
 }
 
 /**
@@ -61,7 +61,7 @@ function get_footer( $name = null ) {
 
        // 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');
 }
 
 /**
@@ -90,7 +90,7 @@ function get_sidebar( $name = null ) {
 
        // 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');
 }
 
 /**
@@ -1721,10 +1721,11 @@ function rich_edit_exists() {
  * @return bool
  */
 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'] ) )
                                && 'comment.php' != $pagenow ) {