Skip to content

Commit 8b58c48

Browse files
authored
Merge pull request #1362 from phalcon/3.4.x
3.4.8
2 parents 730e542 + f7aa444 commit 8b58c48

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

scripts/Phalcon/Devtools/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ class Version extends PhVersion
3939
*/
4040
protected static function _getVersion()
4141
{
42-
return [3, 4, 7, 0, 0];
42+
return [3, 4, 8, 0, 0];
4343
}
4444
}

scripts/Phalcon/Web/Tools/Controllers/ScaffoldController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function generateAction()
5858
try {
5959
$tableName = $this->request->getPost('tableName', 'string');
6060

61-
$scaffoldBuilder = new Scaffold([
61+
$options = [
6262
'name' => $tableName,
6363
'schema' => $this->request->getPost('schema', 'string'),
6464
'force' => $this->request->getPost('force', 'int'),
@@ -67,8 +67,9 @@ public function generateAction()
6767
'templatePath' => $this->request->getPost('templatesPath', 'string'),
6868
'templateEngine' => $this->request->getPost('templateEngine', 'string'),
6969
'modelsNamespace' => $this->request->getPost('modelsNamespace', 'string'),
70-
]);
70+
];
7171

72+
$scaffoldBuilder = new Scaffold(array_merge($options, ['config' => $this->config->toArray()]));
7273
$scaffoldBuilder->build();
7374

7475
$this->flashSession->success(

0 commit comments

Comments
 (0)