From 6524623a6ac299ae0b539cbe2ca9700ae238ead0 Mon Sep 17 00:00:00 2001 From: Ryan Boren 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: https://develop.svn.wordpress.org/trunk@18263 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-settings.php b/wp-settings.php index e24cc7d02e..36f0f60536 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' ) )