From db4a0ae336603f51abc50717c242eaa3322e35f1 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sun, 20 Sep 2009 08:47:12 +0000 Subject: [PATCH] Installer spewing warnings due to disable_functions --- RELEASE-NOTES | 2 ++ config/Installer.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e576ac2c9e..85681c958f 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -510,6 +510,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN assume the user object is equal to the current-user object ($wgUser) * (bug 20517) Cancel link from edit page now returns to the old version when editing an old version +* (bug 16902) Installer no longer shows warnings when exec() has been disabled + by disable_functions == API changes in 1.16 == diff --git a/config/Installer.php b/config/Installer.php index 8689b986bc..0a3c5237b1 100644 --- a/config/Installer.php +++ b/config/Installer.php @@ -2200,7 +2200,7 @@ function printListItem( $item ) { function getShellLocale( $wikiLang ) { # Give up now if we're in safe mode or open_basedir # It's theoretically possible but tricky to work with - if ( wfIniGetBool( "safe_mode" ) || ini_get( 'open_basedir' ) ) { + if ( wfIniGetBool( "safe_mode" ) || ini_get( 'open_basedir' ) || !function_exists('exec') ) { return false; } -- 2.20.1