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
This commit is contained in:
parent
d9875e0aa0
commit
aa2c4ef173
1 changed files with 3 additions and 1 deletions
|
|
@ -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 = '
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue