[evolvis-commits] r17716: debpkg-versioning pending merges:↵ Thorsten Glaser 2011-11-09 replay FF trunk SVN r14770; aljeux says it’s correct that way

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Nov 9 16:12:26 CET 2011


Author: mirabilos
Date: 2011-11-09 16:12:25 +0100 (Wed, 09 Nov 2011)
New Revision: 17716

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/FusionForge.class.php
Log:
debpkg-versioning pending merges:
  Thorsten Glaser 2011-11-09 replay FF trunk SVN r14770; aljeux says it’s correct that way


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/FusionForge.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/FusionForge.class.php	2011-11-09 09:58:30 UTC (rev 17715)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/FusionForge.class.php	2011-11-09 15:12:25 UTC (rev 17716)
@@ -23,9 +23,6 @@
 
 require_once $gfcommon.'include/Error.class.php';
 
-// Some variables are overridden if installed from a package
- at include_once $gfcommon.'pkginfo.inc.php';
-
 class FusionForge extends Error {
 
 	var $software_name ;
@@ -36,10 +33,13 @@
 	 *	FusionForge - FusionForge object constructor
 	 */
 	function FusionForge() {
-		global $forge_pkg_name, $forge_pkg_version, $forge_pkg_type;
-
 		$this->Error();
 
+		$pkg = dirname(dirname(__FILE__)).'/pkginfo.inc.php';
+		if (file_exists($pkg)) {
+			include $pkg;
+		}
+
 		if (isset($forge_pkg_name)) {
 			$this->software_name = $forge_pkg_name;
 		} else {



More information about the evolvis-commits mailing list