Changeset 1426

Timestamp:

Jul 4, 2006, 12:44:22 AM (18 years ago)

Author:

plg

Message:

merge -r1424:1425 from branch 1.6 to trunk (bug 395 fixed: the upgrade feed
can be performed only if PHPWG_IN_UPGRADE is true).

File:

• trunk/include/common.inc.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -133 +133 @@
 or die ( "Could not connect to database" );
 
-if ($conf['check_upgrade_feed'])
+if ($conf['check_upgrade_feed']
+    and defined('PHPWG_IN_UPGRADE')
+    and PHPWG_IN_UPGRADE)
 {
   // retrieve already applied upgrades