Allow stylesheet only themes to provide functions.php. Props skeltoac. fixes #3048
git-svn-id: https://develop.svn.wordpress.org/trunk@4131 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
578fcb99df
commit
e0da7f0d1d
@ -202,6 +202,7 @@ $wp = new WP();
|
|||||||
|
|
||||||
validate_current_theme();
|
validate_current_theme();
|
||||||
define('TEMPLATEPATH', get_template_directory());
|
define('TEMPLATEPATH', get_template_directory());
|
||||||
|
define('STYLESHEETPATH', get_stylesheet_directory());
|
||||||
|
|
||||||
// Load the default text localization domain.
|
// Load the default text localization domain.
|
||||||
load_default_textdomain();
|
load_default_textdomain();
|
||||||
@ -212,8 +213,10 @@ require_once(ABSPATH . WPINC . '/locale.php');
|
|||||||
$wp_locale = new WP_Locale();
|
$wp_locale = new WP_Locale();
|
||||||
|
|
||||||
// Load functions for active theme.
|
// Load functions for active theme.
|
||||||
if ( file_exists(TEMPLATEPATH . "/functions.php") )
|
if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . '/functions.php') )
|
||||||
include(TEMPLATEPATH . "/functions.php");
|
include(STYLESHEETPATH . '/functions.php');
|
||||||
|
if ( file_exists(TEMPLATEPATH . '/functions.php') )
|
||||||
|
include(TEMPLATEPATH . '/functions.php');
|
||||||
|
|
||||||
function shutdown_action_hook() {
|
function shutdown_action_hook() {
|
||||||
do_action('shutdown');
|
do_action('shutdown');
|
||||||
|
Loading…
Reference in New Issue
Block a user