X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..baca9ce86a38dc54c4574890ee2d352fd81f78b2:/wp-includes/load.php
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 4e7c6923..1742af40 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -19,7 +19,7 @@ function wp_unregister_GLOBALS() {
return;
if ( isset( $_REQUEST['GLOBALS'] ) )
- die( /*WP_I18N_GLOBALS_OVERWRITE*/'GLOBALS overwrite attempt detected'/*/WP_I18N_GLOBALS_OVERWRITE*/ );
+ die( 'GLOBALS overwrite attempt detected' );
// Variables that shouldn't be unset
$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
@@ -97,22 +97,21 @@ function wp_fix_server_vars() {
*
* Dies if requirements are not met.
*
- * This function must be able to work without a complete environment set up. In wp-load.php, for
- * example, WP_CONTENT_DIR is defined and version.php is included before this function is called.
- *
* @access private
* @since 3.0.0
*/
function wp_check_php_mysql_versions() {
- // we can probably extend this function to check if wp_die() exists then use translated strings, and then use it in install.php etc.
-
global $required_php_version, $wp_version;
$php_version = phpversion();
- if ( version_compare( $required_php_version, $php_version, '>' ) )
- die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.'/*/WP_I18N_OLD_PHP*/, $php_version, $wp_version, $required_php_version ) );
+ if ( version_compare( $required_php_version, $php_version, '>' ) ) {
+ wp_load_translations_early();
+ die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
+ }
- if ( !extension_loaded( 'mysql' ) && !file_exists( WP_CONTENT_DIR . '/db.php' ) )
- die( /*WP_I18N_OLD_MYSQL*/'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'/*/WP_I18N_OLD_MYSQL*/ );
+ if ( ! extension_loaded( 'mysql' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+ wp_load_translations_early();
+ die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
+ }
}
/**
@@ -159,6 +158,8 @@ function wp_maintenance() {
die();
}
+ wp_load_translations_early();
+
$protocol = $_SERVER["SERVER_PROTOCOL"];
if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
$protocol = 'HTTP/1.0';
@@ -166,15 +167,15 @@ function wp_maintenance() {
header( 'Content-Type: text/html; charset=utf-8' );
header( 'Retry-After: 600' );
?>
-
-
+
+ >
- <?php echo /*WP_I18N_MAINTENANCE*/'Maintenance'/*/WP_I18N_MAINTENANCE*/; ?>
+ <?php _e( 'Maintenance' ); ?>
-
+
* which will do what the above does. If you need the result, you can assign it to a variable, but
- * most cases, you only need to echo it.
+ * in most cases, you only need to echo it.
*
* @since 0.71
- * @global int $timestart Seconds and Microseconds added together from when timer_start() is called
- * @global int $timeend Seconds and Microseconds added together from when function is called
+ * @global float $timestart Seconds from when timer_start() is called
+ * @global float $timeend Seconds from when function is called
*
* @param int $display Use '0' or null to not echo anything and 1 to echo the total time
* @param int $precision The amount of digits from the right of the decimal to display. Default is 3.
@@ -222,9 +222,7 @@ function timer_start() {
*/
function timer_stop( $display = 0, $precision = 3 ) { // if called like timer_stop(1), will echo $timetotal
global $timestart, $timeend;
- $mtime = microtime();
- $mtime = explode( ' ', $mtime );
- $timeend = $mtime[1] + $mtime[0];
+ $timeend = microtime( true );
$timetotal = $timeend - $timestart;
$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
if ( $display )
@@ -249,9 +247,9 @@ function timer_stop( $display = 0, $precision = 3 ) { // if called like timer_st
* development environments.
*
* When WP_DEBUG_DISPLAY is true, WordPress will force errors to be displayed.
- * WP_DEBUG_DISPLAY defaults to true. Defining it as false prevents WordPress from
- * changing the global configuration setting. (Defining WP_DEBUG_DISPLAY as false
- * will never force errors to be hidden.)
+ * WP_DEBUG_DISPLAY defaults to true. Defining it as null prevents WordPress from
+ * changing the global configuration setting. Defining WP_DEBUG_DISPLAY as false
+ * will force errors to be hidden.
*
* When WP_DEBUG_LOG is true, errors will be logged to wp-content/debug.log.
* WP_DEBUG_LOG defaults to false.
@@ -270,6 +268,8 @@ function wp_debug_mode() {
if ( WP_DEBUG_DISPLAY )
ini_set( 'display_errors', 1 );
+ elseif ( null !== WP_DEBUG_DISPLAY )
+ ini_set( 'display_errors', 0 );
if ( WP_DEBUG_LOG ) {
ini_set( 'log_errors', 1 );
@@ -285,9 +285,9 @@ function wp_debug_mode() {
*
* To set directory manually, define WP_LANG_DIR in wp-config.php.
*
- * If the language directory exists within WP_CONTENT_DIR that is used
- * Otherwise if the language directory exists within WPINC, that's used
- * Finally, If neither of the preceeding directories is found,
+ * If the language directory exists within WP_CONTENT_DIR, that is used.
+ * Otherwise if the language directory exists within WPINC, that's used.
+ * Finally, if neither of the preceding directories are found,
* WP_CONTENT_DIR/languages is used.
*
* The WP_LANG_DIR constant was introduced in 2.1.0.
@@ -356,7 +356,7 @@ function wp_set_wpdb_vars() {
dead_db();
$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
- 'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'commment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
+ 'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d',
// multisite:
@@ -365,8 +365,10 @@ function wp_set_wpdb_vars() {
$prefix = $wpdb->set_prefix( $table_prefix );
- if ( is_wp_error( $prefix ) )
- wp_die( /*WP_I18N_BAD_PREFIX*/'ERROR: $table_prefix in wp-config.php can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/ );
+ if ( is_wp_error( $prefix ) ) {
+ wp_load_translations_early();
+ wp_die( __( 'ERROR: $table_prefix in wp-config.php can only contain numbers, letters, and underscores.' ) );
+ }
}
/**
@@ -379,7 +381,7 @@ function wp_set_wpdb_vars() {
* @since 3.0.0
*/
function wp_start_object_cache() {
- global $_wp_using_ext_object_cache;
+ global $_wp_using_ext_object_cache, $blog_id;
$first_init = false;
if ( ! function_exists( 'wp_cache_init' ) ) {
@@ -394,20 +396,20 @@ function wp_start_object_cache() {
} else if ( !$_wp_using_ext_object_cache && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
// Sometimes advanced-cache.php can load object-cache.php before it is loaded here.
// This breaks the function_exists check above and can result in $_wp_using_ext_object_cache
- // being set incorrectly. Double check if an external cache exists.
+ // being set incorrectly. Double check if an external cache exists.
$_wp_using_ext_object_cache = true;
}
// If cache supports reset, reset instead of init if already initialized.
// Reset signals to the cache that global IDs have changed and it may need to update keys
// and cleanup caches.
- if ( !$first_init && function_exists('wp_cache_reset') )
- wp_cache_reset();
+ if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
+ wp_cache_switch_to_blog( $blog_id );
else
wp_cache_init();
if ( function_exists( 'wp_cache_add_global_groups' ) ) {
- wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) );
+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
}
}
@@ -566,7 +568,7 @@ function shutdown_action_hook() {
*/
function wp_clone( $object ) {
- // Use parens for clone to accommodate PHP 4. See #17880
+ // Use parens for clone to accommodate PHP 4. See #17880
return clone( $object );
}
@@ -581,8 +583,11 @@ function wp_clone( $object ) {
* @return bool True if inside WordPress administration pages.
*/
function is_admin() {
- if ( defined( 'WP_ADMIN' ) )
+ if ( isset( $GLOBALS['current_screen'] ) )
+ return $GLOBALS['current_screen']->in_admin();
+ elseif ( defined( 'WP_ADMIN' ) )
return WP_ADMIN;
+
return false;
}
@@ -597,8 +602,11 @@ function is_admin() {
* @return bool True if inside WordPress network administration pages.
*/
function is_blog_admin() {
- if ( defined( 'WP_BLOG_ADMIN' ) )
+ if ( isset( $GLOBALS['current_screen'] ) )
+ return $GLOBALS['current_screen']->in_admin( 'site' );
+ elseif ( defined( 'WP_BLOG_ADMIN' ) )
return WP_BLOG_ADMIN;
+
return false;
}
@@ -613,8 +621,11 @@ function is_blog_admin() {
* @return bool True if inside WordPress network administration pages.
*/
function is_network_admin() {
- if ( defined( 'WP_NETWORK_ADMIN' ) )
+ if ( isset( $GLOBALS['current_screen'] ) )
+ return $GLOBALS['current_screen']->in_admin( 'network' );
+ elseif ( defined( 'WP_NETWORK_ADMIN' ) )
return WP_NETWORK_ADMIN;
+
return false;
}
@@ -629,8 +640,11 @@ function is_network_admin() {
* @return bool True if inside WordPress user administration pages.
*/
function is_user_admin() {
- if ( defined( 'WP_USER_ADMIN' ) )
+ if ( isset( $GLOBALS['current_screen'] ) )
+ return $GLOBALS['current_screen']->in_admin( 'user' );
+ elseif ( defined( 'WP_USER_ADMIN' ) )
return WP_USER_ADMIN;
+
return false;
}
@@ -651,4 +665,97 @@ function is_multisite() {
return false;
}
-?>
+/**
+ * Retrieve the current blog id
+ *
+ * @since 3.1.0
+ *
+ * @return int Blog id
+ */
+function get_current_blog_id() {
+ global $blog_id;
+ return absint($blog_id);
+}
+
+/**
+ * Attempts an early load of translations.
+ *
+ * Used for errors encountered during the initial loading process, before the locale has been
+ * properly detected and loaded.
+ *
+ * Designed for unusual load sequences (like setup-config.php) or for when the script will then
+ * terminate with an error, otherwise there is a risk that a file can be double-included.
+ *
+ * @since 3.4.0
+ * @access private
+ */
+function wp_load_translations_early() {
+ global $text_direction, $wp_locale;
+
+ static $loaded = false;
+ if ( $loaded )
+ return;
+ $loaded = true;
+
+ if ( function_exists( 'did_action' ) && did_action( 'init' ) )
+ return;
+
+ // We need $wp_local_package
+ require ABSPATH . WPINC . '/version.php';
+
+ // Translation and localization
+ require_once ABSPATH . WPINC . '/pomo/mo.php';
+ require_once ABSPATH . WPINC . '/l10n.php';
+ require_once ABSPATH . WPINC . '/locale.php';
+
+ // General libraries
+ require_once ABSPATH . WPINC . '/plugin.php';
+
+ $locales = $locations = array();
+
+ while ( true ) {
+ if ( defined( 'WPLANG' ) ) {
+ if ( '' == WPLANG )
+ break;
+ $locales[] = WPLANG;
+ }
+
+ if ( isset( $wp_local_package ) )
+ $locales[] = $wp_local_package;
+
+ if ( ! $locales )
+ break;
+
+ if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
+ $locations[] = WP_LANG_DIR;
+
+ if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
+ $locations[] = WP_CONTENT_DIR . '/languages';
+
+ if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
+ $locations[] = ABSPATH . 'wp-content/languages';
+
+ if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
+ $locations[] = ABSPATH . WPINC . '/languages';
+
+ if ( ! $locations )
+ break;
+
+ $locations = array_unique( $locations );
+
+ foreach ( $locales as $locale ) {
+ foreach ( $locations as $location ) {
+ if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
+ load_textdomain( 'default', $location . '/' . $locale . '.mo' );
+ if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
+ load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+ break 2;
+ }
+ }
+ }
+
+ break;
+ }
+
+ $wp_locale = new WP_Locale();
+}