Ticket #3048: load-both-functions.diff

wp-settings.php

@@ -202 +202 @@
 
 validate_current_theme();
 define('TEMPLATEPATH', get_template_directory());
+define('STYLESHEETPATH', get_stylesheet_directory());
 
 // Load the default text localization domain.
 load_default_textdomain();
@@ -212 +213 @@
 $wp_locale = new WP_Locale();
 
 // Load functions for active theme.
-if ( file_exists(TEMPLATEPATH . "/functions.php") )
-        include(TEMPLATEPATH . "/functions.php");
+if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . '/functions.php') )
+        include(STYLESHEETPATH . '/functions.php');
+if ( file_exists(TEMPLATEPATH . '/functions.php') )
+        include(TEMPLATEPATH . '/functions.php');
 
 function shutdown_action_hook() {
         do_action('shutdown');