Changeset 15433

Timestamp:

07/16/2010 09:40:09 AM (16 years ago)

Author:

westi

Message:

Fix the theme compat file require paths to be fully absolute so they don't rely on a particular php path to work. Fixes #14315 for trunk props dougal.

Location:

trunk/wp-includes

Files:

• comment-template.php (modified) (1 diff)
• general-template.php (modified) (3 diffs)
• theme.php (modified) (2 diffs)

trunk/wp-includes/comment-template.php

@@ -921 +921 @@
                 require( TEMPLATEPATH .  $file );
         else // Backward compat code will be removed in a future release
-                require( WPINC . '/theme-compat/comments.php');
+                require( ABSPATH . WPINC . '/theme-compat/comments.php');
 }
 

trunk/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');
 }
 

trunk/wp-includes/theme.php

@@ -1024 +1024 @@
         // Backward compat code will be removed in a future release
         if ('' == $template)
-                $template = WPINC . '/theme-compat/comments-popup.php';
+                $template = ABSPATH . WPINC . '/theme-compat/comments-popup.php';
 
         return apply_filters('comments_popup_template', $template);
@@ -1082 +1082 @@
         if ( is_array( $wp_query->query_vars ) )
                 extract( $wp_query->query_vars, EXTR_SKIP );
+
+        error_log( $_template_file );
 
         if ( $require_once )