diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-26 15:45:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-26 15:45:20 +0000 |
| commit | 28781ebb081ab8d99b30a33f5cd911b3b050bcc9 (patch) | |
| tree | f21e6b7d3dd06002c58dd52ae2eae10d64d62d85 /wp-settings.php | |
| parent | cbd939114d362bfece3839d7d5d5e07367fd6be8 (diff) | |
WP Merge to rev 4254
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@770 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
| -rw-r--r-- | wp-settings.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/wp-settings.php b/wp-settings.php index f91d822..57bce50 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -3,7 +3,7 @@ if( defined( 'ABSPATH' ) == false ) die(); // Turn register globals off -function unregister_GLOBALS() { +function wp_unregister_GLOBALS() { if ( !ini_get('register_globals') ) return; @@ -19,7 +19,7 @@ function unregister_GLOBALS() { unset($GLOBALS[$k]); } -unregister_GLOBALS(); +wp_unregister_GLOBALS(); unset( $wp_filter, $cache_userdata, $cache_lastcommentmodified, $cache_lastpostdate, $cache_settings, $category_cache, $cache_categories ); @@ -84,6 +84,10 @@ if ( defined('WP_CACHE') ) require (ABSPATH . 'wp-content/advanced-cache.php'); define('WPINC', 'wp-includes'); +if ( !defined('LANGDIR') ) + define('LANGDIR', WPINC . '/languages'); // no leading slash, no trailing slash +if ( !defined('PLUGINDIR') ) + define('PLUGINDIR', 'wp-content/plugins'); // no leading slash, no trailing slash if ( file_exists(ABSPATH . 'wp-content/db.php') ) require (ABSPATH . 'wp-content/db.php'); else |