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

[Jonathan Wiltshire]

Author: jmw
Date: 2012-06-04 18:47:44 +0000 (Mon, 04 Jun 2012)
New Revision: 316

Added:
   mediawiki/trunk/debian/patches/fix_invalid_sql_2.patch
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/patches/series
Log:
Backport fix_invalid_sql_2.patch

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2012-06-04 18:46:27 UTC (rev 315)
+++ mediawiki/trunk/debian/changelog	2012-06-04 18:47:44 UTC (rev 316)
@@ -1,6 +1,7 @@
 mediawiki (1:1.19.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Backport fix_invalid_sql_2.patch from sid branch
 
  -- Jonathan Wiltshire <jmw at debian.org>  Wed, 30 May 2012 23:37:38 +0100
 

Added: mediawiki/trunk/debian/patches/fix_invalid_sql_2.patch
===================================================================
--- mediawiki/trunk/debian/patches/fix_invalid_sql_2.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/fix_invalid_sql_2.patch	2012-06-04 18:47:44 UTC (rev 316)
@@ -0,0 +1,15 @@
+# DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673125#12
+# DP: Remove trailing commas from search path to prevent invalid SQL
+
+Index: mediawiki-1.15.5/maintenance/updaters.inc
+===================================================================
+--- mediawiki-1.15.5.orig/maintenance/updaters.inc	2012-05-30 16:48:59.000000000 +0200
++++ mediawiki-1.15.5/maintenance/updaters.inc	2012-05-30 16:49:03.000000000 +0200
+@@ -1413,6 +1413,7 @@
+ 		$search_path = "$search_path, $wgDBts2schema";
+ 	}
+ 	$search_path = str_replace( ', ,', ',', $search_path);
++	$search_path = preg_replace( '/, *$/', '', $search_path);
+ 	if( array_key_exists( 'search_path', $conf ) === false || $search_path != $conf['search_path'] ) {
+ 		$wgDatabase->doQuery( "ALTER USER $wgDBuser SET search_path = $search_path" );
+ 		$wgDatabase->doQuery( "SET search_path = $search_path" );

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2012-06-04 18:46:27 UTC (rev 315)
+++ mediawiki/trunk/debian/patches/series	2012-06-04 18:47:44 UTC (rev 316)
@@ -2,3 +2,4 @@
 mimetypes.patch
 suppress_warnings.patch
 fix_invalid_sql.patch
+fix_invalid_sql_2.patch