From b863511166629290a09e23fdea88b6f440c05320 Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 11 Jun 2011 03:04:04 +0000 Subject: [PATCH] Load the theme's functions.php for wp-activate.php. Props nacin, frumph. fixes #17761 git-svn-id: http://svn.automattic.com/wordpress/trunk@18263 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-settings.php b/wp-settings.php index e24cc7d02..36f0f6053 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -273,7 +273,7 @@ require( ABSPATH . WPINC . '/locale.php' ); $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' ) )