[evolvis-commits] r6932: Correct <base> URI in dumps and $wgServer

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Sep 7 19:04:49 CEST 2010


Author: mirabilos
Date: 2010-09-07 19:04:49 +0200 (Tue, 07 Sep 2010)
New Revision: 6932

Modified:
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/LocalSettings.php
Log:
Correct <base> URI in dumps and $wgServer

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-09-07 17:04:48 UTC (rev 6931)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-09-07 17:04:49 UTC (rev 6932)
@@ -24,11 +24,12 @@
   * Sort comments in Tasks and Tracker chronologically
   * Correct require into require_once and unbreak mw-wrapper.php
   * Add optional backtraces to the pink-popup error handler
+  * Correct <base> URI in dumps and $wgServer
 
   [ Alain Peyrat ]
   * Switch default search type from OR to AND
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 07 Sep 2010 11:10:05 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 07 Sep 2010 11:52:57 +0200
 
 gforge (4.8.3+evolvis24) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/LocalSettings.php	2010-09-07 17:04:48 UTC (rev 6931)
+++ trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/LocalSettings.php	2010-09-07 17:04:49 UTC (rev 6932)
@@ -143,6 +143,8 @@
 $GLOBALS['sys_session_expire'] = $sys_session_expire;
 $GLOBALS['REMOTE_ADDR'] = getStringFromServer('REMOTE_ADDR') ;
 $GLOBALS['HTTP_USER_AGENT'] = getStringFromServer('HTTP_USER_AGENT') ;
+//XXX add $GLOBALS['sys_urlprefix'] ?
+$wgServer = util_url_prefix() . $GLOBALS['sys_default_domain'] ;
 
 function ifsetor(&$val, $default = false) {
 	return (isset($val) ? $val : $default);



More information about the evolvis-commits mailing list