Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 1a117ea

Browse files
author
Charles Ma
committed
ENH: fixed #155 Added sql files and upgrade/3.1.0.php
fixed #143 Fixed pgsql upgrade
1 parent aeccd78 commit 1a117ea

File tree

8 files changed

+874
-11
lines changed

8 files changed

+874
-11
lines changed

core/controllers/InstallController.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ function step3Action()
247247
$formArray['description']->setValue($applicationConfig['global']['application.description']);
248248
$formArray['smartoptimizer']->setValue($applicationConfig['global']['smartoptimizer']);
249249
$formArray['timezone']->setValue($applicationConfig['global']['default.timezone']);
250-
$formArray['process']->setValue($applicationConfig['global']['processing']);
251250

252251
$assetstrores = $this->Assetstore->getAll();
253252

@@ -272,7 +271,6 @@ function step3Action()
272271
$applicationConfig['global']['defaultassetstore.id'] = $assetstrores[0]->getKey();
273272
$applicationConfig['global']['smartoptimizer'] = $form->getValue('smartoptimizer');
274273
$applicationConfig['global']['default.timezone'] = $form->getValue('timezone');
275-
$applicationConfig['global']['processing'] = $form->getValue('process');
276274

277275
$this->Component->Utility->createInitFile(BASE_PATH.'/core/configs/application.local.ini', $applicationConfig);
278276
$this->_redirect("/admin?checkRecentItem=true#tabs-modules");

core/controllers/components/UpgradeComponent.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function initUpgrade($module, $db, $dbtype)
3232
{
3333
$this->dir = BASE_PATH.'/modules/'.$module.'/database/upgrade';
3434
}
35-
35+
3636
$this->db = $db;
3737
$this->module = $module;
3838
$this->dbtype = $dbtype;
@@ -248,7 +248,7 @@ protected function _processFile($migration)
248248
throw new Zend_Exception("Could not find class '".$classname."' in file '".$filename."'");
249249
}
250250

251-
$class = new $classname($this->db, $this->module);
251+
$class = new $classname($this->db, $this->module, $this->dbtype);
252252
$class->preUpgrade();
253253
$dbtypeShort = $this->dbtypeShort;
254254
$class->$dbtypeShort();

0 commit comments

Comments
 (0)