[evolvis-commits] r6642: merge bm:taramir/patches/theme-evolvis

mirabilos at evolvis.org mirabilos at evolvis.org
Mon May 17 17:56:10 CEST 2010


Author: mirabilos
Date: 2010-05-17 17:56:10 +0200 (Mon, 17 May 2010)
New Revision: 6642

Modified:
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/etc/local.d/25features
   trunk/gforge_base/evolvisforge/gforge/setup
   trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/Theme.class.php
Log:
merge bm:taramir/patches/theme-evolvis

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-05-17 14:39:04 UTC (rev 6641)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-05-17 15:56:10 UTC (rev 6642)
@@ -1,3 +1,10 @@
+gforge (4.8.3+evolvis15) unstable; urgency=low
+
+  * Allow using a different DB host than localhost for the
+    old-style external MediaWiki detection in the Evolvis theme
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 17 May 2010 17:22:50 +0200
+
 gforge (4.8.3+evolvis14) unstable; urgency=low
 
   [ Roland Mas ]

Modified: trunk/gforge_base/evolvisforge/gforge/etc/local.d/25features
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/local.d/25features	2010-05-17 14:39:04 UTC (rev 6641)
+++ trunk/gforge_base/evolvisforge/gforge/etc/local.d/25features	2010-05-17 15:56:10 UTC (rev 6642)
@@ -45,6 +45,7 @@
 
 // Old-style (external) wiki support, e.g. "https://wiki.evolvis.org/"
 $sys_oldstyle_external_wiki_base="{sys_oldstyle_external_wiki_base}";
+$sys_oldstyle_external_wiki_conn='{sys_oldstyle_external_wiki_conn}';
 
 // Hudson support, e.g. "https://hudson:1234/"
 $sys_hudson_base="{sys_hudson_base}";

Modified: trunk/gforge_base/evolvisforge/gforge/setup
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/setup	2010-05-17 14:39:04 UTC (rev 6641)
+++ trunk/gforge_base/evolvisforge/gforge/setup	2010-05-17 15:56:10 UTC (rev 6642)
@@ -131,6 +131,7 @@
 	DEFAULTsys_apache_group=$(findapacheowner)
 	DEFAULTsys_forum_return_domain=$DEFAULTdomain_name
 	DEFAULTsys_oldstyle_external_wiki_base=
+	DEFAULTsys_oldstyle_external_wiki_conn='host=localhost user=$sys_dbuser password=$sys_dbpasswd port=5432 dbname=mw_evolvis'
 	DEFAULTsys_hudson_base=
 	#
 	# TODO

Modified: trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/Theme.class.php	2010-05-17 14:39:04 UTC (rev 6641)
+++ trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/Theme.class.php	2010-05-17 15:56:10 UTC (rev 6642)
@@ -569,7 +569,9 @@
 	 *	@param	string	Is the group we should look up get title info
 	 */
 	function projectTabs($toptab,$group) {
-		global $sys_dbpasswd, $sys_dbuser, $sys_dbhost, $sys_oldstyle_external_wiki_base;
+		global $sys_dbpasswd, $sys_dbuser, $sys_dbhost,
+		    $sys_oldstyle_external_wiki_base,
+		    $sys_oldstyle_external_wiki_conn;
 
 		// get group info using the common result set
 		$project =& group_get_object($group);
@@ -591,7 +593,7 @@
 
 		// Wiki (old-style separate, by Jutta Horstmann)
 		if (!empty($sys_oldstyle_external_wiki_base)) {
-			$dbconn = pg_connect("host=localhost user=$sys_dbuser password=$sys_dbpasswd port=5432 dbname=mw_evolvis");
+			$dbconn = pg_connect($sys_oldstyle_external_wiki_conn);
 			$sql="SELECT * FROM pg_catalog.pg_namespace WHERE nspname='".str_replace("-", "", $project->getUnixName())."'";
 			$res=pg_query($dbconn, $sql);
 			if (db_numrows($res) == 1) {




More information about the evolvis-commits mailing list