[Fusionforge-commits] r15401 - in branches/Branch_5_2: . src/db src/debian

Roland Mas lolando at fusionforge.org
Fri Apr 27 14:29:38 CEST 2012


Author: lolando
Date: 2012-04-27 14:29:38 +0200 (Fri, 27 Apr 2012)
New Revision: 15401

Modified:
   branches/Branch_5_2/
   branches/Branch_5_2/src/db/upgrade-db.php
   branches/Branch_5_2/src/debian/changelog
Log:
Fix include path in upgrade-db.php so it can run even if the web parts aren't installed

Modified: branches/Branch_5_2/src/db/upgrade-db.php
===================================================================
--- branches/Branch_5_2/src/db/upgrade-db.php	2012-04-27 12:23:04 UTC (rev 15400)
+++ branches/Branch_5_2/src/db/upgrade-db.php	2012-04-27 12:29:38 UTC (rev 15401)
@@ -6,7 +6,7 @@
 // upgrade-db.php <plugin> => Upgrade only the database of the given active plugin.
 echo "Entering  upgrade-db.php\n";
 
-require_once dirname(__FILE__).'/../www/env.inc.php';
+require_once dirname(__FILE__).'/env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require_once $gfcommon.'include/sqlparser.php';
 

Modified: branches/Branch_5_2/src/debian/changelog
===================================================================
--- branches/Branch_5_2/src/debian/changelog	2012-04-27 12:23:04 UTC (rev 15400)
+++ branches/Branch_5_2/src/debian/changelog	2012-04-27 12:29:38 UTC (rev 15401)
@@ -1,9 +1,11 @@
 fusionforge (5.1.50+svn15228-2) UNRELEASED; urgency=low
 
-  * Disable authcas plugin at least until phpCAS is packaged in Debian
-    (closes: #666908).
+  * Disable authcas plugin at least until phpCAS is packaged in Debian,
+    thanks to Laurent Bonnaud (closes: #666908).
+  * Fixed upgrade-db.php so it can run even without gforge-web-apache2
+    installed, thanks to Andreas Beckmann (closes: #668970).
 
- -- Roland Mas <lolando at debian.org>  Fri, 27 Apr 2012 14:22:07 +0200
+ -- Roland Mas <lolando at debian.org>  Fri, 27 Apr 2012 14:28:49 +0200
 
 fusionforge (5.1.50+svn15228-1) experimental; urgency=low
 




More information about the Fusionforge-commits mailing list