libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Мелкие правки

Browse source
This commit is contained in:
origami11 2017-06-22 16:08:58 +03:00
parent ce7d909ea8
commit 7dad5d30ac
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Controller/Action.php
View file

@ -62,6 +62,7 @@ class Controller_Action
public function loadConfig($name) { public function loadConfig($name) {
$filename = Shortcut::getUrl('config', $name); $filename = Shortcut::getUrl('config', $name);
$settings = [];
if (file_exists($filename)) { if (file_exists($filename)) {
include($filename); include($filename);
} else { } else {

2
src/Controller/Component.php
View file

@ -194,7 +194,7 @@ class Controller_Component
$view->component_title = $settings['title']; $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); $expression = htmlspecialchars_decode($expression);

4
src/Form/Form.php
View file

@ -217,9 +217,9 @@ class OptionFactory {
} else if (isset($input['options.db'])) { } else if (isset($input['options.db'])) {
list($table, $keyvalue) = explode(":", $input['options.db']); list($table, $keyvalue) = explode(":", $input['options.db']);
list($key, $value) = explode(",", $keyvalue); list($key, $value) = explode(",", $keyvalue);
try{ try {
$query_result = $this->db->executeQuery("SELECT * FROM $table"); $query_result = $this->db->executeQuery("SELECT * FROM $table");
}catch(Exception $ex){ } catch(Exception $ex) {
$query_result = []; $query_result = [];
} }
$field->options = $this->optionsDB($key, $value, $query_result); $field->options = $this->optionsDB($key, $value, $query_result);