merge -r1424:1425 from branch 1.6 to trunk (bug 395 fixed: the upgrad…

…e feed can be performed only if PHPWG_IN_UPGRADE is true). git-svn-id: http://piwigo.org/svn/trunk@1426 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jul 3, 2006 · aa2c4ef · aa2c4ef
1 parent d9875e0
commit aa2c4ef
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/include/common.inc.php b/include/common.inc.php
@@ -132,7 +132,9 @@
 mysql_select_db( $cfgBase )
 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
   $query = '