update to MediaWiki 1.15.2

5 files changed, 33 insertions, 5 deletions

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 427e5d09..67d513ed 100644
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -81,7 +81,8 @@ for ( $linenum = 1; !feof( $file ); $linenum++ ) {
 	$dbw->begin();
 	$err = $source->moveTo( $dest, false, $reason );
 	if( $err !== true ) {
-		print "\nFAILED: $err";
+		$msg = array_shift( $err[0] );
+		print "\nFAILED: " . wfMsg( $msg, $err[0] );
 	}
 	$dbw->immediateCommit();
 	print "\n";
diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 1a427005..d7249ff2 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -4357,6 +4357,23 @@ Table attribute safety
 
 !! end
 
+!! test
+CSS line continuation 1
+!! input
+<div style="background-image: u\&#10;rl(test.jpg);"></div>
+!! result
+<div></div>
+
+!! end
+
+!! test
+CSS line continuation 2
+!! input
+<div style="background-image: u\&#13;rl(test.jpg); "></div>
+!! result
+<div></div>
+
+!! end
 
 !! article
 Template:Identity
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 23e8b596..9a26f2d1 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -599,5 +599,5 @@ CREATE TABLE mediawiki_version (
 );
 
 INSERT INTO mediawiki_version (type,mw_version,sql_version,sql_date)
-  VALUES ('Creation','??','$LastChangedRevision: 48615 $','$LastChangedDate: 2009-03-20 12:15:41 +1100 (Fri, 20 Mar 2009) $');
+  VALUES ('Creation','??','$LastChangedRevision: 48615 $','$LastChangedDate: 2009-03-19 18:15:41 -0700 (Thu, 19 Mar 2009) $');
 
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index edef1fdc..81c54cc5 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1221,7 +1221,8 @@ function do_populate_parent_id() {
 
 function sqlite_initial_indexes() {
 	global $wgDatabase;
-	if ( update_row_exists( 'initial_indexes' ) ) {
+	// initial-indexes.sql fails if the indexes are already present, so we perform a quick check if our database is newer.
+	if ( update_row_exists( 'initial_indexes' ) || $wgDatabase->indexExists( 'user', 'user_name' ) ) {
 		wfOut( "...have initial indexes\n" );
 		return;
 	}
@@ -1813,8 +1814,8 @@ function do_postgres_updates() {
 			'ctype' => 'U',
 			'mw_version' => $wgVersion,
 			'pg_version' => $version,
-			'sql_version' => '$LastChangedRevision: 51640 $',
-			'sql_date' => '$LastChangedDate: 2009-06-09 22:58:05 +1000 (Tue, 09 Jun 2009) $',
+			'sql_version' => '$LastChangedRevision: 60080 $',
+			'sql_date' => '$LastChangedDate: 2009-12-15 09:24:12 -0800 (Tue, 15 Dec 2009) $',
 		) );
 	return;
 }
diff --git a/maintenance/upgrade1_5.php b/maintenance/upgrade1_5.php
index dd4acaae..32634b67 100644
--- a/maintenance/upgrade1_5.php
+++ b/maintenance/upgrade1_5.php
@@ -18,6 +18,15 @@ $options = array( 'step', 'noimages' );
 require_once( 'commandLine.inc' );
 require_once( 'FiveUpgrade.inc' );
 
+echo "ATTENTION: This script is for upgrades from 1.4 to 1.5 (NOT 1.15) in very special cases.\n";
+echo "Use update.php for usual updates.\n";
+
+// Seems to confuse some people
+if ( !array_search( '--upgrade', $_SERVER['argv'] ) ) {
+	echo "Please run this script with --upgrade key to actually run the updater.\n";
+	die;
+}
+
 $upgrade = new FiveUpgrade();
 $step = isset( $options['step'] ) ? $options['step'] : null;
 $upgrade->upgrade( $step );