Load the theme's functions.php for wp-activate.php. Props nacin, frum…

…ph. fixes #17761 git-svn-id: http://svn.automattic.com/wordpress/trunk@18263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
leohoo · Jun 11, 2011 · b863511 · b863511
1 parent fcf8586
commit b863511
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/wp-settings.php b/wp-settings.php
@@ -273,7 +273,7 @@
 $wp_locale = new WP_Locale();
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
-if ( ! defined( 'WP_INSTALLING' ) ) {
+if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
 	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
 		include( STYLESHEETPATH . '/functions.php' );
 	if ( file_exists( TEMPLATEPATH . '/functions.php' ) )