https://www.mediawiki.org/wiki/Special:Code/MediaWiki/101867

Revision: 101867
Author:   demon
Date:     2011-11-03 20:15:27 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
*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.

Modified Paths:
--------------
    trunk/phase3/includes/DefaultSettings.php
    trunk/phase3/maintenance/update.php

Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php   2011-11-03 20:01:39 UTC (rev 
101866)
+++ trunk/phase3/includes/DefaultSettings.php   2011-11-03 20:15:27 UTC (rev 
101867)
@@ -1423,6 +1423,8 @@
 $wgWantedPagesThreshold = 1;
 /** Enable slow parser functions */
 $wgAllowSlowParserFunctions = false;
+/** Allow schema updates */
+$wgAllowSchemaUpdates = true;
 
 /**
  * Do DELETE/INSERT for link updates instead of incremental

Modified: trunk/phase3/maintenance/update.php
===================================================================
--- trunk/phase3/maintenance/update.php 2011-11-03 20:01:39 UTC (rev 101866)
+++ trunk/phase3/maintenance/update.php 2011-11-03 20:15:27 UTC (rev 101867)
@@ -43,7 +43,7 @@
                $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 @@
        }
 
        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 );


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to