summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-09-15 15:45:31 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-09-15 15:45:31 +0000
commit0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8 (patch)
tree5b95d4a59dbb761f8da80c9e894d22a7a547b00c /wp-settings.php
parent66b0871abeef45cdbe757c97a643076503b6c656 (diff)
downloadwordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.tar.gz
wordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.tar.xz
wordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.zip
Merge with WP 2.6.2
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1471 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-settings.php b/wp-settings.php
index d58c344..9f7fb82 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -101,7 +101,7 @@ if ( empty($PHP_SELF) || constant( 'VHOST' ) == 'no' )
$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
if ( version_compare( '4.3', phpversion(), '>' ) ) {
- 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() ) );
+ 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 ( !defined('WP_CONTENT_DIR') )