[Fusionforge-commits] r9568 - in trunk/gforge/plugins/mediawiki: cronjobs etc/plugins/mediawiki scripts

Christian Bayle cbayle at libremir.placard.fr.eu.org
Wed Apr 21 20:46:06 CEST 2010


Author: cbayle
Date: 2010-04-21 20:46:06 +0200 (Wed, 21 Apr 2010)
New Revision: 9568

Modified:
   trunk/gforge/plugins/mediawiki/cronjobs/create-wikis.php
   trunk/gforge/plugins/mediawiki/etc/plugins/mediawiki/LocalSettings.php
   trunk/gforge/plugins/mediawiki/scripts/mediawiki-plugin-init.php
Log:
Replace sys_opt_path with sys_share_path


Modified: trunk/gforge/plugins/mediawiki/cronjobs/create-wikis.php
===================================================================
--- trunk/gforge/plugins/mediawiki/cronjobs/create-wikis.php	2010-04-21 18:46:00 UTC (rev 9567)
+++ trunk/gforge/plugins/mediawiki/cronjobs/create-wikis.php	2010-04-21 18:46:06 UTC (rev 9568)
@@ -51,7 +51,7 @@
 	"$sys_etc_path/plugins/mediawiki/ProjectSettings.template.php";
 if (!file_exists($project_settings_template))
 	$project_settings_template =
-		"$sys_opt_path/plugins/mediawiki/etc/plugins/mediawiki/ProjectSettings.template.php";
+		"$sys_share_path/plugins/mediawiki/etc/plugins/mediawiki/ProjectSettings.template.php";
 
 # Owner of files - apache
 $file_owner = forge_get_config('apache_user').':'.forge_get_config('apache_group');
@@ -170,7 +170,7 @@
 			exit;
 		}
 
-		$mwwrapper = $sys_opt_path."/plugins/mediawiki/bin/mw-wrapper.php" ;
+		$mwwrapper = $sys_share_path."/plugins/mediawiki/bin/mw-wrapper.php" ;
 		$dumpfile = $sys_etc_path."/mediawiki/initial-content.xml" ;
 		
 		if (file_exists ($dumpfile)) {

Modified: trunk/gforge/plugins/mediawiki/etc/plugins/mediawiki/LocalSettings.php
===================================================================
--- trunk/gforge/plugins/mediawiki/etc/plugins/mediawiki/LocalSettings.php	2010-04-21 18:46:00 UTC (rev 9567)
+++ trunk/gforge/plugins/mediawiki/etc/plugins/mediawiki/LocalSettings.php	2010-04-21 18:46:06 UTC (rev 9568)
@@ -11,12 +11,12 @@
 
 if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
 	// when loaded from the server
-        require_once ("$sys_opt_path/www/env.inc.php") ;
-	require_once ("$sys_opt_path/www/include/pre.php") ;
+        require_once ("$sys_share_path/www/env.inc.php") ;
+	require_once ("$sys_share_path/www/include/pre.php") ;
 } else {
 	// when run from the command line
         require_once ("$sys_etc_path/database.inc") ;
-	require_once ("$sys_opt_path/common/include/config.php") ;
+	require_once ("$sys_share_path/common/include/config.php") ;
 }
 
 $IP = $mediawiki_master_path;

Modified: trunk/gforge/plugins/mediawiki/scripts/mediawiki-plugin-init.php
===================================================================
--- trunk/gforge/plugins/mediawiki/scripts/mediawiki-plugin-init.php	2010-04-21 18:46:00 UTC (rev 9567)
+++ trunk/gforge/plugins/mediawiki/scripts/mediawiki-plugin-init.php	2010-04-21 18:46:06 UTC (rev 9568)
@@ -80,10 +80,10 @@
 	closedir ($dh);
 }
 
-# link LocalSettings.php from /etc/gforge/plugins/mediawiki/LocalSettings.php or from $sys_opt_path/plugins/mediawiki/etc/plugins/mediawiki/LocalSettings.php
+# link LocalSettings.php from /etc/gforge/plugins/mediawiki/LocalSettings.php or from $sys_share_path/plugins/mediawiki/etc/plugins/mediawiki/LocalSettings.php
 $from = "$sys_etc_path/plugins/mediawiki/LocalSettings.php";
 if (!file_exists($from)) {
-	$from = "$sys_opt_path/plugins/mediawiki/etc/plugins/mediawiki/LocalSettings.php";
+	$from = "$sys_share_path/plugins/mediawiki/etc/plugins/mediawiki/LocalSettings.php";
 }
 $to = "$mediawiki_master_path/LocalSettings.php";
 mysymlink($from, $to);
@@ -94,7 +94,7 @@
 	mkdir($todir);
 
 # link FusionForge skin file
-$fromdir = "$sys_opt_path/plugins/mediawiki/mediawiki-skin";
+$fromdir = "$sys_share_path/plugins/mediawiki/mediawiki-skin";
 $from = "$fromdir/FusionForge.php";
 $to = "$todir/FusionForge.php";
 mysymlink($from, $to);




More information about the Fusionforge-commits mailing list