Commit dd9d7b616490ec3763d443df2d23ec4472bdb83b
1 parent
6b15ed67
Upgrader cleanup
Committed by: Jarrett Jordaan Reviewed by: Paul Barrett
Showing
1 changed file
with
1 additions
and
6 deletions
setup/upgrade/steps/upgradeDatabase.php
| @@ -242,12 +242,9 @@ class upgradeDatabase extends Step | @@ -242,12 +242,9 @@ class upgradeDatabase extends Step | ||
| 242 | private function doDatabaseUpgrade() | 242 | private function doDatabaseUpgrade() |
| 243 | { | 243 | { |
| 244 | $errors = false; | 244 | $errors = false; |
| 245 | - | ||
| 246 | $this->temp_variables['detail'] = '<p>The table below describes the upgrades that have occurred to | 245 | $this->temp_variables['detail'] = '<p>The table below describes the upgrades that have occurred to |
| 247 | upgrade your KnowledgeTree installation to <strong>' . $this->sysVersion . '</strong>'; | 246 | upgrade your KnowledgeTree installation to <strong>' . $this->sysVersion . '</strong>'; |
| 248 | - | ||
| 249 | $this->performPreUpgradeActions(); | 247 | $this->performPreUpgradeActions(); |
| 250 | - | ||
| 251 | $res = $this->performAllUpgrades(); | 248 | $res = $this->performAllUpgrades(); |
| 252 | if (!$res) { | 249 | if (!$res) { |
| 253 | $errors = true; | 250 | $errors = true; |
| @@ -261,12 +258,10 @@ class upgradeDatabase extends Step | @@ -261,12 +258,10 @@ class upgradeDatabase extends Step | ||
| 261 | If the problem persists, contact KnowledgeTree Support.'; | 258 | If the problem persists, contact KnowledgeTree Support.'; |
| 262 | } | 259 | } |
| 263 | else { | 260 | else { |
| 261 | + $this->performPostUpgradeActions(); | ||
| 264 | $this->temp_variables['upgradeStatus'] = '<font color="green">Upgrade succeeded.</font>'; | 262 | $this->temp_variables['upgradeStatus'] = '<font color="green">Upgrade succeeded.</font>'; |
| 265 | } | 263 | } |
| 266 | 264 | ||
| 267 | - $this->performPostUpgradeActions(); | ||
| 268 | - | ||
| 269 | - | ||
| 270 | return !$errors; | 265 | return !$errors; |
| 271 | } | 266 | } |
| 272 | 267 |