Index: branches/REL1_15/phase3/maintenance/upgrade1_5.php |
— | — | @@ -18,6 +18,15 @@ |
19 | 19 | require_once( 'commandLine.inc' ); |
20 | 20 | require_once( 'FiveUpgrade.inc' ); |
21 | 21 | |
| 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 | + |
22 | 31 | $upgrade = new FiveUpgrade(); |
23 | 32 | $step = isset( $options['step'] ) ? $options['step'] : null; |
24 | 33 | $upgrade->upgrade( $step ); |
Property changes on: branches/REL1_15/phase3/maintenance |
___________________________________________________________________ |
Modified: svn:mergeinfo |
25 | 34 | Merged /trunk/phase3/maintenance:r58941 |
Index: branches/REL1_15/phase3/RELEASE-NOTES |
— | — | @@ -5,22 +5,6 @@ |
6 | 6 | |
7 | 7 | == MediaWiki 1.15.2 == |
8 | 8 | |
9 | | -* (bug 20239) MediaWiki:Imagemaxsize does not contain anymore a <br /> tag which |
10 | | - was displayed to the user |
11 | | -* (bug 21150) SQLite no longer raise an error when deleting files |
12 | | -* (bug 20880) Fixed updater failure on SQLite backend |
13 | | - |
14 | | -=== Changes since 1.15.1 === |
15 | | - |
16 | | -* Installer now includes a check for a data corruption issue with certain |
17 | | - versions of libxml2 2.7 and PHP earlier than 5.2.9. |
18 | | - |
19 | | -== MediaWiki 1.15.1 == |
20 | | - |
21 | | -July 14, 2009 |
22 | | - |
23 | | -This is a security and bugfix release of the the 2009 Q2 branch of MediaWiki. |
24 | | - |
25 | 9 | MediaWiki is now using a "continuous integration" development model with |
26 | 10 | quarterly snapshot releases. The latest development code is always kept |
27 | 11 | "ready to run", and in fact runs our own sites on Wikipedia. |
— | — | @@ -32,6 +16,16 @@ |
33 | 17 | Those wishing to use the latest code instead of a branch release can obtain |
34 | 18 | it from source control: http://www.mediawiki.org/wiki/Download_from_SVN |
35 | 19 | |
| 20 | +=== Changes since 1.15.1 === |
| 21 | + |
| 22 | +* Installer now includes a check for a data corruption issue with certain |
| 23 | + versions of libxml2 2.7 and PHP earlier than 5.2.9. |
| 24 | +* (bug 20239) MediaWiki:Imagemaxsize does not contain anymore a <br /> tag which |
| 25 | + was displayed to the user |
| 26 | +* (bug 21150) SQLite no longer raise an error when deleting files |
| 27 | +* (bug 20880) Fixed updater failure on SQLite backend |
| 28 | +* upgrade1_5.php now requires to be run --update option to prevent confusion |
| 29 | + |
36 | 30 | === Changes since 1.15.0 === |
37 | 31 | |
38 | 32 | * Fixed fatal errors for unusual file repository configurations, such as |
Property changes on: branches/REL1_15/phase3 |
___________________________________________________________________ |
Modified: svn:mergeinfo |
39 | 33 | Merged /trunk/phase3:r58941 |