Changeset 29044 for trunk/src/wp-settings.php

Timestamp:

07/09/2014 06:06:54 PM (11 years ago)

Author:

wonderboymusic

Message:

Revert [28563]. See #18298.

File:

• trunk/src/wp-settings.php (modified) (1 diff)

trunk/src/wp-settings.php

@@ -323 +323 @@
 // Load the functions for the active theme, for both parent and child theme if applicable.
 if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
-    if ( is_child_theme() && file_exists( get_stylesheet_directory() . '/functions.php' ) ) {
-        include get_stylesheet_directory() . '/functions.php';
-    }
-    if ( file_exists( get_template_directory() . '/functions.php' ) ) {
-        include get_template_directory() . '/functions.php';
-    }
+    if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
+        include( STYLESHEETPATH . '/functions.php' );
+    if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
+        include( TEMPLATEPATH . '/functions.php' );
 }