*grumble grumble* know it alls think I'm abusing $wgMiserMode. So fine, have a SHINY...

This is not a "useless" error message, regardless of what the bug claims.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 58e2b54..801d581 100644 (file)
--- 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 16561f5..35e8104 100644 (file)
--- 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 );