Permalink
Browse files

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
  • Loading branch information...
ryan
ryan committed Jun 11, 2011
1 parent fcf8586 commit b863511166629290a09e23fdea88b6f440c05320
Showing with 1 addition and 1 deletion.
  1. +1 −1 wp-settings.php
View
@@ -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' ) )

0 comments on commit b863511

Please sign in to comment.