[evolvis-commits] r18481: merge some cleanup parts from wiki-1.19-files branch (that are safe w/ 1.15)

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Jul 12 11:24:52 CEST 2012


Author: mirabilos
Date: 2012-07-12 11:24:52 +0200 (Thu, 12 Jul 2012)
New Revision: 18481

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/LocalSettings.php
Log:
merge some cleanup parts from wiki-1.19-files branch (that are safe w/ 1.15)

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-07-12 09:13:55 UTC (rev 18480)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-07-12 09:24:52 UTC (rev 18481)
@@ -5,8 +5,9 @@
   * Move the MW plugin enable/disable code from the metapackage
     to the MW plugin, so they are enabled at the point in time
     where MW DB upgrade scripts are run
+  * MW plugin: make upgrading spit out less warning msgs
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 12 Jul 2012 11:10:48 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 12 Jul 2012 11:24:01 +0200
 
 fusionforge (1:5.1.1+evolvis64) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php	2012-07-12 09:13:55 UTC (rev 18480)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php	2012-07-12 09:24:52 UTC (rev 18481)
@@ -52,6 +52,7 @@
 		. "/$project";
 	cron_debug("Checking $project...");
 
+	$res = db_query_params("SET search_path=public", array());
 	$res = db_query_params('DELETE FROM interwiki WHERE iw_prefix=$1', array($project));
 	$url = util_make_url('/plugins/mediawiki/wiki/' . $project . '/index.php/$1');
 	$res = db_query_params('INSERT INTO interwiki VALUES ($1, $2, 1, 0)',

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/LocalSettings.php	2012-07-12 09:13:55 UTC (rev 18480)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/LocalSettings.php	2012-07-12 09:24:52 UTC (rev 18481)
@@ -26,6 +26,10 @@
  * Mediawiki plugin of FusionForge.
  */
 
+/* C style inclusion guard. Yes, I know. Don’t comment on it. */
+if (!isset($fusionforge_plugin_mediawiki_LocalSettings_included)) {
+$fusionforge_plugin_mediawiki_LocalSettings_included = true;
+
 require_once dirname(__FILE__) . '/../../../www/env.inc.php';
 require_once $gfcommon.'include/pre.php';
 sysdebug_lazymode(true);
@@ -63,6 +67,8 @@
 $path = array( $IP, "$IP/includes", "$IP/languages" );
 set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() );
 
+require_once( "$IP/includes/AutoLoader.php" );
+require_once( "$IP/includes/Defines.php" );
 require_once( "$IP/includes/DefaultSettings.php" );
 
 if ( $wgCommandLineMode ) {
@@ -71,9 +77,6 @@
         }
 }
 
-# Start the autoloader, so that extensions can derive classes from core files
-require_once("$IP/includes/AutoLoader.php");
-
 class DatabaseForge extends DatabasePostgres {
 	function DatabaseForge($server=false, $user=false, $password=false,
 	    $dbName=false, $failFunction=false, $flags=0) {
@@ -461,3 +464,6 @@
 // mode: php
 // c-file-style: "bsd"
 // End:
+
+/* !isset($fusionforge_plugin_mediawiki_LocalSettings_included) */
+}



More information about the evolvis-commits mailing list