Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

This commit is contained in:
Albert Santoni 2013-12-12 13:32:25 -05:00
commit 27f0fa27e9
2 changed files with 21 additions and 10 deletions

View file

@ -1005,7 +1005,7 @@ SQL;
->filterByDbId($instanceId)
->findOne();
}
if ($update && (!$ccShowInstance || $ccShowInstance->getDbModifiedInstance() == true)) {
if ($update && ($ccShowInstance && $ccShowInstance->getDbModifiedInstance() == true)) {
return false;
}