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

Merge remote-tracking branch 'origin/dev'

Browse source
This commit is contained in:
Фёдор Подлеснов 2018-02-06 15:28:41 +03:00
commit 080733b2eb
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Form/OptionFactory.php
View file

@ -32,10 +32,10 @@ class Form_OptionFactory {
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) {
$query_result = [];
}
$field->options = $this->optionsDB($key, $value, $query_result); $field->options = $this->optionsDB($key, $value, $query_result);
} catch(Exception $ex) {
$field->options = [];
}
} elseif (isset($input['options.pair'])) { } elseif (isset($input['options.pair'])) {
$field->options = $this->optionsPair($input['options.pair']); $field->options = $this->optionsPair($input['options.pair']);
} elseif (isset($input['options.model'])) { } elseif (isset($input['options.model'])) {