From 61ff866b4b29aecbb1880696b7778319d6d6b3dd Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 3 Nov 2011 20:15:27 +0000 Subject: [PATCH] *grumble grumble* know it alls think I'm abusing $wgMiserMode. So fine, have a SHINY NEW GLOBAL INSTEAD. bug 32072, r92109, yada-yada. This is not a "useless" error message, regardless of what the bug claims. --- includes/DefaultSettings.php | 2 ++ maintenance/update.php | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 58e2b54d60..801d581700 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1423,6 +1423,8 @@ $wgQueryCacheLimit = 1000; $wgWantedPagesThreshold = 1; /** Enable slow parser functions */ $wgAllowSlowParserFunctions = false; +/** Allow schema updates */ +$wgAllowSchemaUpdates = true; /** * Do DELETE/INSERT for link updates instead of incremental diff --git a/maintenance/update.php b/maintenance/update.php index 16561f56e9..35e8104ec3 100644 --- a/maintenance/update.php +++ b/maintenance/update.php @@ -43,7 +43,7 @@ class UpdateMediaWiki extends Maintenance { $this->addOption( 'quick', 'Skip 5 second countdown before starting' ); $this->addOption( 'doshared', 'Also update shared tables' ); $this->addOption( 'nopurge', 'Do not purge the objectcache table after updates' ); - $this->addOption( 'force', 'Override when $wgMiserMode disables this script' ); + $this->addOption( 'force', 'Override when $wgAllowSchemaUpdates disables this script' ); } function getDbType() { @@ -76,9 +76,9 @@ class UpdateMediaWiki extends Maintenance { } function execute() { - global $wgVersion, $wgTitle, $wgLang, $wgMiserMode; + global $wgVersion, $wgTitle, $wgLang, $wgAllowSchemaUpdates; - if( $wgMiserMode && !$this->hasOption( 'force' ) ) { + if( $wgAllowSchemaUpdates && !$this->hasOption( 'force' ) ) { $this->error( "Do not run update.php on this wiki. If you're seeing this you should\n" . "probably ask for some help in performing your schema updates.\n\n" . "If you know what you are doing, you can continue with --force", true ); -- 2.20.1