r58941 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r58940‎ | r58941 | r58942 >
Date:13:12, 12 November 2009
Author:maxsem
Status:ok
Tags:
Comment:
Some measures to prevent people from update.php/upgrade1_5.php confusion: the latter now displays a warning and requires --update switch to do something. Probably, it's time to put it to death completely?
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/maintenance/upgrade1_5.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/upgrade1_5.php
@@ -18,6 +18,15 @@
1919 require_once( dirname(__FILE__) . '/commandLine.inc' );
2020 require_once( 'FiveUpgrade.inc' );
2121
 22+echo "ATTENTION: This script is for upgrades from 1.4 to 1.5 (NOT 1.15) in very special cases.\n";
 23+echo "Use update.php for usual updates.\n";
 24+
 25+// Seems to confuse some people
 26+if ( !array_search( '--upgrade', $_SERVER['argv'] ) ) {
 27+ echo "Please run this script with --upgrade key to actually run the updater.\n";
 28+ die;
 29+}
 30+
2231 $upgrade = new FiveUpgrade();
2332 $step = isset( $options['step'] ) ? $options['step'] : null;
2433 $upgrade->upgrade( $step );
Index: trunk/phase3/RELEASE-NOTES
@@ -277,6 +277,7 @@
278278 * Added search capabilities to SQLite backend
279279 * rebuildtextindex.php maintenance script now supports databases other than
280280 MySQL
 281+* upgrade1_5.php now requires to be run --update option to prevent confusion
281282
282283 === Bug fixes in 1.16 ===
283284

Follow-up revisions

RevisionCommit summaryAuthorDate
r60922Backported r58941 and fixed some RELEASE-NOTES issues.tstarling05:03, 11 January 2010

Status & tagging log