[Pkg-mediawiki-commits] r260 - in mediawiki/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2011-07-06 10:22:31 +0000 (Wed, 06 Jul 2011)
New Revision: 260

Added:
   mediawiki/trunk/debian/patches/fix_invalid_sql.patch
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/patches/series
Log:
schedule patch to fix invalid SQL for next upload


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2011-04-18 11:55:56 UTC (rev 259)
+++ mediawiki/trunk/debian/changelog	2011-07-06 10:22:31 UTC (rev 260)
@@ -1,3 +1,10 @@
+mediawiki (1:1.15.5-4) UNRELEASED; urgency=low
+
+  [ Thorsten Glaser ]
+  * debian/patches/fix_invalid_sql.patch: new (Closes: #615983)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 06 Jul 2011 12:21:31 +0200
+
 mediawiki (1:1.15.5-3) unstable; urgency=high
 
   [ Thorsten Glaser ]

Added: mediawiki/trunk/debian/patches/fix_invalid_sql.patch
===================================================================
--- mediawiki/trunk/debian/patches/fix_invalid_sql.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/fix_invalid_sql.patch	2011-07-06 10:22:31 UTC (rev 260)
@@ -0,0 +1,23 @@
+Fix invalid SQL: Debian #615983
+| A database error has occurred
+| Query: INSERT IGNORE INTO page_restrictions (pr_page,pr_type,pr_level,pr_cascade,pr_user,pr_expiry) SELECT 793,pr_type,pr_level,pr_cascade,pr_user,pr_expiry FROM page_restrictions WHERE pr_page = '216'
+| Function: Title::moveTo
+| Error: 1 ERROR: syntax error at or near "IGNORE"
+| LINE 1: INSERT /* Title::moveTo Jgeese */ IGNORE INTO page_restricti...
+| ^
+Reference: https://evolvis.org/tracker/t_follow.php/1377
+
+Index: mediawiki-1.15.5/includes/Title.php
+===================================================================
+--- mediawiki-1.15.5.orig/includes/Title.php	2011-07-06 12:11:08.000000000 +0200
++++ mediawiki-1.15.5/includes/Title.php	2011-07-06 12:11:17.000000000 +0200
+@@ -2710,8 +2710,7 @@
+ 					'pr_expiry'  => 'pr_expiry'
+ 				),
+ 				array( 'pr_page' => $pageid ),
+-				__METHOD__,
+-				array( 'IGNORE' )
++				__METHOD__
+ 			);
+ 			# Update the protection log
+ 			$log = new LogPage( 'protect' );

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2011-04-18 11:55:56 UTC (rev 259)
+++ mediawiki/trunk/debian/patches/series	2011-07-06 10:22:31 UTC (rev 260)
@@ -8,3 +8,4 @@
 CVE-2011-0003.patch
 fix_datetime.patch
 CVE-2011-0047.patch
+fix_invalid_sql.patch