From 7dad5d30ac220faa3039092590c071b2272bd6b0 Mon Sep 17 00:00:00 2001 From: origami11 Date: Thu, 22 Jun 2017 16:08:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Controller/Action.php | 1 + src/Controller/Component.php | 2 +- src/Form/Form.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Controller/Action.php b/src/Controller/Action.php index 67b213a..9c72537 100644 --- a/src/Controller/Action.php +++ b/src/Controller/Action.php @@ -62,6 +62,7 @@ class Controller_Action public function loadConfig($name) { $filename = Shortcut::getUrl('config', $name); + $settings = []; if (file_exists($filename)) { include($filename); } else { diff --git a/src/Controller/Component.php b/src/Controller/Component.php index 5d56d24..cbb5514 100644 --- a/src/Controller/Component.php +++ b/src/Controller/Component.php @@ -194,7 +194,7 @@ class Controller_Component $view->component_title = $settings['title']; } - static function loadComponent($expression, Database $db, Settings $registry) + static function loadComponent($expression, Database $db, /*.Settings.*/ $registry) { $expression = htmlspecialchars_decode($expression); diff --git a/src/Form/Form.php b/src/Form/Form.php index 585f06a..3ea0a59 100644 --- a/src/Form/Form.php +++ b/src/Form/Form.php @@ -217,9 +217,9 @@ class OptionFactory { } else if (isset($input['options.db'])) { list($table, $keyvalue) = explode(":", $input['options.db']); list($key, $value) = explode(",", $keyvalue); - try{ + try { $query_result = $this->db->executeQuery("SELECT * FROM $table"); - }catch(Exception $ex){ + } catch(Exception $ex) { $query_result = []; } $field->options = $this->optionsDB($key, $value, $query_result);