diff options
| author | plegall <plg@piwigo.org> | 2006-07-03 22:44:22 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2006-07-03 22:44:22 +0000 |
| commit | aa2c4ef173b7a38ce727aab9818b370e26742e4a (patch) | |
| tree | cd8cc7f105888b8c8b8c7fc6384569e289da9d59 | |
| parent | d9875e0aa00457704465ddd1778b76e92fdba6e2 (diff) | |
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).
git-svn-id: http://piwigo.org/svn/trunk@1426 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/common.inc.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index 65782b282..0d0a05f20 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -132,7 +132,9 @@ or die ( "Could not connect to database server" ); 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 = ' |