antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-10393' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-10 12:01:33 +01:00
commit 4df24497c7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/purchaseguide/classes/FormBuilder.php
View File

@ -1,9 +1,9 @@
<?php
define('FORM_DIR', __DIR__.'/../templates/form/');
class FormBuilder
{
const FORM_DIR = __DIR__.'/../templates/form/';
private $class_name;
private $table_name;
private $identifier;
@ -59,7 +59,7 @@ class FormBuilder
];
$smarty->assign($smarty_params);
echo $smarty->fetch(self::FORM_DIR.'form_edit.tpl');
echo $smarty->fetch(FORM_DIR.'form_edit.tpl');
}
@ -84,7 +84,7 @@ class FormBuilder
private function prepareTemplatePath(&$field)
{
$field['template'] = self::FORM_DIR.$field['type'].'.tpl';
$field['template'] = FORM_DIR.$field['type'].'.tpl';
}
private function prepareFileInput(&$field)
@ -138,7 +138,7 @@ class FormBuilder
$rows = $field['options_raw'];
$keys = $field['options_map'];
$options = [];
$options = array();
foreach($rows as $row) {
$options_row['value'] = $row[$keys[0]];
$options_row['label'] = $row[$keys[1]];

4
modules/purchaseguide/classes/GuideCategory.php
View File

@ -89,7 +89,7 @@ class GuideCategory extends ObjectModel
if ($exclude_id!='0') {
$sql .= " AND a.`id_guide_category` <> '".intval($exclude_id)."'";
}
$rows = [];
$rows = array();
self::findRecursiveData(
$rows,
$sql,
@ -114,7 +114,7 @@ class GuideCategory extends ObjectModel
if ($exclude_id!='0') {
$sql .= " AND a.`id_category_family` <> '".intval($exclude_id)."'";
}
$rows = [];
$rows = array;
self::findRecursiveData(
$rows,
$sql,