diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-01-06 10:06:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-01-06 10:06:20 +0000 |
| commit | 12a70ca4a30a719ec19f9cd4fe6b9095ec9fe8a5 (patch) | |
| tree | 7a0f94770be334ac3b8486a2ca43a9ef58a649d1 /wp-inst/wp-settings.php | |
| parent | b57ac48281c44847de6f128c109c5d13bd46d1cc (diff) | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@493 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-settings.php')
| -rw-r--r-- | wp-inst/wp-settings.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php index 48e9b8e..274db1b 100644 --- a/wp-inst/wp-settings.php +++ b/wp-inst/wp-settings.php @@ -35,7 +35,7 @@ if ( empty( $_SERVER['REQUEST_URI'] ) ) { } // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests -if ( strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7 ) +if ( isset($_SERVER['SCRIPT_FILENAME']) && ( strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7 ) ) $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED']; // Fix for Dreamhost and other PHP as CGI hosts @@ -376,8 +376,8 @@ if ( file_exists(TEMPLATEPATH . "/functions.php") ) include(TEMPLATEPATH . "/functions.php"); function shutdown_action_hook() { - wp_cache_close(); do_action('shutdown'); + wp_cache_close(); } register_shutdown_function('shutdown_action_hook'); |