TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor code consistency

This commit is contained in:
Samuel Georges 2016-07-27 17:21:38 +10:00
parent 3ab90da6b5
commit 83a541f819
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/cms/controllers/Index.php
View File

@ -138,22 +138,27 @@ class Index extends Controller
$type = Request::input('templateType');
$templatePath = trim(Request::input('templatePath'));
$template = $templatePath ? $this->loadTemplate($type, $templatePath) : $this->createTemplate($type);
$formWidget = $this->makeTemplateFormWidget($type, $template);
$saveData = $formWidget->getSaveData();
$postData = post();
$templateData = [];
$settings = array_get($saveData, 'settings', []) + Request::input('settings', []);
$settings = $this->upgradeSettings($settings);
$templateData = [];
if ($settings) {
$templateData['settings'] = $settings;
}
$fields = ['markup', 'code', 'fileName', 'content'];
foreach ($fields as $field) {
if (array_key_exists($field, $_POST)) {
$templateData[$field] = Request::input($field);
if (array_key_exists($field, $saveData)) {
$templateData[$field] = $saveData[$field];
}
elseif (array_key_exists($field, $postData)) {
$templateData[$field] = $postData[$field];
}
}