diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-05-21 18:37:58 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-05-21 18:37:58 +0000 |
| commit | 89fe0ff804e7c6497ebacc8b341ac89974f6f255 (patch) | |
| tree | 3fce310b29c685008fdbb75c5ab531bc3a6ae12a /wp-settings.php | |
| parent | a139071806ba941346a109fbefb2d5f22bae1cc4 (diff) | |
| download | wordpress-mu-89fe0ff804e7c6497ebacc8b341ac89974f6f255.tar.gz wordpress-mu-89fe0ff804e7c6497ebacc8b341ac89974f6f255.tar.xz wordpress-mu-89fe0ff804e7c6497ebacc8b341ac89974f6f255.zip | |
WP Merge to rev 5499, this is a big one! Test it before you put it live!
Test only, not for production use yet
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
| -rw-r--r-- | wp-settings.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wp-settings.php b/wp-settings.php index 25833c6..9fa1350 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -77,7 +77,7 @@ function timer_stop($display = 0, $precision = 3) { //if called like timer_stop( $mtime = $mtime[1] + $mtime[0]; $timeend = $mtime; $timetotal = $timeend-$timestart; - $r = number_format($timetotal, $precision); + $r = number_format_i18n($timetotal, $precision); if ( $display ) echo $r; return $r; @@ -89,7 +89,7 @@ error_reporting(E_ALL ^ E_NOTICE); // For an advanced caching plugin to use, static because you would only want one if ( defined('WP_CACHE') ) - require (ABSPATH . 'wp-content/advanced-cache.php'); + @include ABSPATH . 'wp-content/advanced-cache.php'; define('WPINC', 'wp-includes'); @@ -148,9 +148,9 @@ if ( defined('CUSTOM_USER_META_TABLE') ) $tableposts = $tableusers = $tablecategories = $tablepost2cat = $tablecomments = $tablelink2cat = $tablelinks = $tablelinkcategories = $tableoptions = $tablepostmeta = ''; if ( file_exists(ABSPATH . 'wp-content/object-cache.php') ) - require (ABSPATH . 'wp-content/object-cache.php'); + require_once (ABSPATH . 'wp-content/object-cache.php'); else - require (ABSPATH . WPINC . '/cache.php'); + require_once (ABSPATH . WPINC . '/cache.php'); // To disable persistant caching, add the below line to your wp-config.php file, uncommented of course. // define('DISABLE_CACHE', true); @@ -333,4 +333,4 @@ register_shutdown_function('shutdown_action_hook'); // Everything is loaded and initialized. do_action('init'); -?> +?>
\ No newline at end of file |