From 5958f6b6140ab7d8d63ac0bfa11324c4f5e8428a Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Sat, 14 May 2016 12:36:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/Model.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/classes/Model.php b/classes/Model.php index 32cbdd2..d908f86 100644 --- a/classes/Model.php +++ b/classes/Model.php @@ -163,11 +163,7 @@ abstract class Model if (isset($params['noKeys'])) { $ready[] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); } else { - if (isset($params['asArrayOf'])) { - $ready[] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); - } else { - $ready[$row[$this->_primaryKey_]] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); - } + $ready[$row[$this->_primaryKey_]] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); } } @@ -178,7 +174,7 @@ abstract class Model * Возвращает один элемент, соотбетствующий параметрам * @param string $whereField - имя поля по которому производим поиск * @param type $whereValue - искомое значение - * @return type + * @return \Model */ function getOne($whereField, $whereValue) { @@ -334,4 +330,13 @@ abstract class Model return FALSE; } + + /** + * Возвращает информаци о том, пуст ли объект. + * @return bool + */ + function isEmpty() + { + return empty($this->_vals_); + } }