From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Mon, 2 Feb 2009 06:05:12 +0000 (+0000)
Subject: Quick fix in case search_path started out empty.
X-Git-Tag: 1.31.0-rc.0~43077
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=134f3929e904a66faa3b2d23c6c76e8721de2ec0;p=lhc%2Fweb%2Fwiklou.git

Quick fix in case search_path started out empty.
---

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 22b114faec..fd76ec845c 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1450,6 +1450,7 @@ function do_postgres_updates() {
 		echo "Adding in schema \"$wgDBts2schema\" to search_path for user \"$wgDBuser\"\n";
 		$search_path = "$search_path, $wgDBts2schema";
 	}
+	$search_path = str_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" );