diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-02 13:44:49 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-02 13:44:49 +0000 |
| commit | 6d572cbe19ffedb5b92d8528798c5683154bb185 (patch) | |
| tree | 4cc943e8f399addf1a10c03386342110bcc9d584 /wp-settings.php | |
| parent | 034c1b3b665fa28816dfc6157d610c6d25fd54fe (diff) | |
| download | wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.tar.gz wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.tar.xz wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.zip | |
WP Merge to rev 8216
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1344 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
| -rw-r--r-- | wp-settings.php | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/wp-settings.php b/wp-settings.php index 95b52e3..d37fb72 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -97,7 +97,7 @@ if ( empty($PHP_SELF) ) $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]); if ( version_compare( '4.3', phpversion(), '>' ) ) { - die( /*WP_I18N_OLD_PHP*/'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/ ); + die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %s but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/, php_version() ) ); } if ( !defined('WP_CONTENT_DIR') ) @@ -402,6 +402,20 @@ if ( !defined('SITECOOKIEPATH') ) /** * 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') ) |