X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..refs/tags/wordpress-2.6.2:/wp-settings.php?ds=sidebyside
diff --git a/wp-settings.php b/wp-settings.php
index 1480288e..466f04a1 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -68,6 +68,10 @@ if ( empty( $_SERVER['REQUEST_URI'] ) ) {
}
else
{
+ // Use ORIG_PATH_INFO if there is no PATH_INFO
+ if ( !isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']) )
+ $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+
// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
if ( isset($_SERVER['PATH_INFO']) ) {
if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
@@ -97,11 +101,14 @@ if ( empty($PHP_SELF) )
$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
if ( version_compare( '4.3', phpversion(), '>' ) ) {
- die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.3.' );
+ die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %s but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/, phpversion() ) );
}
-if ( !extension_loaded('mysql') && !file_exists(ABSPATH . 'wp-content/db.php') )
- die( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' );
+if ( !defined('WP_CONTENT_DIR') )
+ define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
+
+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*/ );
/**
* timer_start() - PHP 4 standard microtime start capture
@@ -166,7 +173,7 @@ if (defined('WP_DEBUG') and WP_DEBUG == true) {
// For an advanced caching plugin to use, static because you would only want one
if ( defined('WP_CACHE') )
- @include ABSPATH . 'wp-content/advanced-cache.php';
+ @include WP_CONTENT_DIR . '/advanced-cache.php';
/**
* Stores the location of the WordPress directory of functions, classes, and core content.
@@ -175,30 +182,28 @@ if ( defined('WP_CACHE') )
*/
define('WPINC', 'wp-includes');
-if ( !defined('LANGDIR') ) {
+if ( !defined('WP_LANG_DIR') ) {
/**
- * Stores the location of the language directory. First looks for language folder in wp-content
+ * Stores the location of the language directory. First looks for language folder in WP_CONTENT_DIR
* and uses that folder if it exists. Or it uses the "languages" folder in WPINC.
*
* @since 2.1.0
*/
- if ( file_exists(ABSPATH . 'wp-content/languages') && @is_dir(ABSPATH . 'wp-content/languages') )
- define('LANGDIR', 'wp-content/languages'); // no leading slash, no trailing slash
- else
- define('LANGDIR', WPINC . '/languages'); // no leading slash, no trailing slash
+ if ( file_exists(WP_CONTENT_DIR . '/languages') && @is_dir(WP_CONTENT_DIR . '/languages') ) {
+ define('WP_LANG_DIR', WP_CONTENT_DIR . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
+ if (!defined('LANGDIR')) {
+ // Old static relative path maintained for limited backwards compatibility - won't work in some cases
+ define('LANGDIR', 'wp-content/languages');
+ }
+ } else {
+ define('WP_LANG_DIR', ABSPATH . WPINC . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
+ if (!defined('LANGDIR')) {
+ // Old relative path maintained for backwards compatibility
+ define('LANGDIR', WPINC . '/languages');
+ }
+ }
}
-/**
- * Allows for the plugins directory to be moved from the default location.
- *
- * This isn't used everywhere. Constant is not used in plugin_basename()
- * which might cause conflicts with changing this.
- *
- * @since 2.1
- */
-if ( !defined('PLUGINDIR') )
- define('PLUGINDIR', 'wp-content/plugins'); // no leading slash, no trailing slash
-
require (ABSPATH . WPINC . '/compat.php');
require (ABSPATH . WPINC . '/functions.php');
require (ABSPATH . WPINC . '/classes.php');
@@ -211,14 +216,18 @@ if ( !empty($wpdb->error) )
$prefix = $wpdb->set_prefix($table_prefix);
if ( is_wp_error($prefix) )
- wp_die('ERROR: $table_prefix in wp-config.php can only contain numbers, letters, and underscores.');
+ 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 ( file_exists(ABSPATH . 'wp-content/object-cache.php') )
- require_once (ABSPATH . 'wp-content/object-cache.php');
+if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') )
+ require_once (WP_CONTENT_DIR . '/object-cache.php');
else
require_once (ABSPATH . WPINC . '/cache.php');
wp_cache_init();
+if ( function_exists('wp_cache_add_global_groups') ) {
+ wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta'));
+ wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
+}
require (ABSPATH . WPINC . '/plugin.php');
require (ABSPATH . WPINC . '/default-filters.php');
@@ -268,7 +277,22 @@ require (ABSPATH . WPINC . '/canonical.php');
require (ABSPATH . WPINC . '/shortcodes.php');
require (ABSPATH . WPINC . '/media.php');
-if (strpos($_SERVER['PHP_SELF'], 'install.php') === false) {
+if ( !defined('WP_CONTENT_URL') )
+ define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
+
+/**
+ * Allows for the plugins directory to be moved from the default location.
+ *
+ * @since 2.6
+ */
+if ( !defined('WP_PLUGIN_DIR') )
+ define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash
+if ( !defined('WP_PLUGIN_URL') )
+ define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash
+if ( !defined('PLUGINDIR') )
+ define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
+
+if ( ! defined('WP_INSTALLING') ) {
// Used to guarantee unique hash cookies
$cookiehash = md5(get_option('siteurl'));
/**
@@ -305,6 +329,20 @@ if ( !defined('PASS_COOKIE') )
if ( !defined('AUTH_COOKIE') )
define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
+/**
+ * It is possible to define this in wp-config.php
+ * @since 2.6
+ */
+if ( !defined('SECURE_AUTH_COOKIE') )
+ define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
+
+/**
+ * It is possible to define this in wp-config.php
+ * @since 2.6
+ */
+if ( !defined('LOGGED_IN_COOKIE') )
+ define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
+
/**
* It is possible to define this in wp-config.php
* @since 2.3.0
@@ -326,13 +364,43 @@ if ( !defined('COOKIEPATH') )
if ( !defined('SITECOOKIEPATH') )
define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+/**
+ * It is possible to define this in wp-config.php
+ * @since 2.6
+ */
+if ( !defined('ADMIN_COOKIE_PATH') )
+ define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+
+/**
+ * It is possible to define this in wp-config.php
+ * @since 2.6
+ */
+if ( !defined('PLUGINS_COOKIE_PATH') )
+ define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL) );
+
/**
* It is possible to define this in wp-config.php
* @since 2.0.0
*/
if ( !defined('COOKIE_DOMAIN') )
define('COOKIE_DOMAIN', false);
-
+
+/**
+ * It is possible to define this in wp-config.php
+ * @since 2.6
+ */
+if ( !defined('FORCE_SSL_ADMIN') )
+ define('FORCE_SSL_ADMIN', false);
+force_ssl_admin(FORCE_SSL_ADMIN);
+
+/**
+ * It is possible to define this in wp-config.php
+ * @since 2.6
+ */
+if ( !defined('FORCE_SSL_LOGIN') )
+ define('FORCE_SSL_LOGIN', false);
+force_ssl_login(FORCE_SSL_LOGIN);
+
/**
* It is possible to define this in wp-config.php
* @since 2.5.0
@@ -353,8 +421,8 @@ if ( get_option('active_plugins') ) {
$current_plugins = get_option('active_plugins');
if ( is_array($current_plugins) ) {
foreach ($current_plugins as $plugin) {
- if ('' != $plugin && file_exists(ABSPATH . PLUGINDIR . '/' . $plugin))
- include_once(ABSPATH . PLUGINDIR . '/' . $plugin);
+ if ( '' != $plugin && 0 == validate_file($plugin) && file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
+ include_once(WP_PLUGIN_DIR . '/' . $plugin);
}
}
}
@@ -376,6 +444,11 @@ if ( defined('WP_CACHE') && function_exists('wp_cache_postload') )
do_action('plugins_loaded');
+$default_constants = array( 'WP_POST_REVISIONS' => true );
+foreach ( $default_constants as $c => $v )
+ @define( $c, $v ); // will fail if the constant is already defined
+unset($default_constants, $c, $v);
+
// If already slashed, strip.
if ( get_magic_quotes_gpc() ) {
$_GET = stripslashes_deep($_GET );
@@ -420,6 +493,7 @@ $wp_rewrite =& new WP_Rewrite();
*/
$wp =& new WP();
+do_action('setup_theme');
/**
* Web Path to the current active template directory
@@ -441,7 +515,7 @@ load_default_textdomain();
* @since 1.5.0
*/
$locale = get_locale();
-$locale_file = ABSPATH . LANGDIR . "/$locale.php";
+$locale_file = WP_LANG_DIR . "/$locale.php";
if ( is_readable($locale_file) )
require_once($locale_file);