| @@ -54,8 +54,9 @@ | ||
| 54 | 54 | $backupId = filter_input(INPUT_GET, 'backupId', FILTER_SANITIZE_NUMBER_INT); |
| 55 | 55 | $blocks['filters']['type'] = 'block'; |
| 56 | 56 | // If backupId is not provided it must be NULL in the filter, |
| 57 | 57 | $blocks['filters']['backupId'] = $backupId ? $backupId : null; |
| 58 | + $blocks['filters']['returnCodeFile'] = true; | |
| 58 | 59 | // Push data to the view. |
| 59 | 60 | $this->view->blocks = $this->model->getBlocks(null, $blocks['filters']); |
| 60 | 61 | $this->view->order = $this->model->getOrder(); |
| 61 | 62 | $this->view->backupId = $blocks['filters']['backupId']; |
| @@ -71,8 +72,15 @@ | ||
| 71 | 72 | * put your comment there... |
| 72 | 73 | * |
| 73 | 74 | */ |
| 74 | 75 | protected function installAction() { |
| 76 | + // Initialize. | |
| 77 | + $model = $this->getModel('installer'); | |
| 78 | + // Do fresh installation if the installed version and the | |
| 79 | + // current version doesn't share the same release and edition signs. | |
| 80 | + if ($model->isUpgrade() && $model->isCommonRelease()) { | |
| 81 | + $this->request['layout'] = 'upgrade'; | |
| 82 | + } | |
| 75 | 83 | echo parent::displayAction(); |
| 76 | 84 | } |
| 77 | 85 | |
| 78 | 86 | /** |
