Skip to content

Commit

Permalink
- Fixed issue: : Undefined index: display : application/core/Survey_C…
Browse files Browse the repository at this point in the history
…ommon_Action.php ; No header at all with debug = 0

- Dev : added $aData['updatedbaction'] to check update database action
  • Loading branch information
louis committed Jul 30, 2015
1 parent c5a8223 commit 02663b1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions application/controllers/admin/update.php
Expand Up @@ -410,6 +410,8 @@ function db($continue = null)
$aViewUrls['output'] = CheckForDBUpgrades();
}

$aData['updatedbaction'] = true;

$this->_renderWrappedTemplate('update', $aViewUrls, $aData);
}

Expand Down
2 changes: 1 addition & 1 deletion application/core/Survey_Common_Action.php
Expand Up @@ -246,7 +246,7 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
// Menu bars
if (!isset($aData['display']['menu_bars']) || ($aData['display']['menu_bars'] !== false && (!is_array($aData['display']['menu_bars']) || !in_array('browse', array_keys($aData['display']['menu_bars'])))))
{
if(!$aData['display']['header']==FALSE)
if(!isset($aData['updatedbaction']))
{
$this->_updatenotification();
Yii::app()->getController()->_showadminmenu(!empty($aData['surveyid']) ? $aData['surveyid'] : null);
Expand Down

0 comments on commit 02663b1

Please sign in to comment.