From 0cb961925d5d5e79a49f3491cf00c95832112a74 Mon Sep 17 00:00:00 2001 From: abijah Date: Thu, 30 Jul 2009 21:34:03 +0000 Subject: [PATCH] The conditions were clamped down too tight, as they prevented something like 'Table.field !=' git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@433 97e9348a-65ac-dc4b-aefc-98561f571b83 --- app_controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app_controller.php b/app_controller.php index 30c93f5..5f4e3a2 100644 --- a/app_controller.php +++ b/app_controller.php @@ -423,14 +423,14 @@ class AppController extends Controller { } $table = $field = null; - if (preg_match("/^\w+\.\w+$/", $filter)) { + if (preg_match("/^\w+\.\w+(\s*[!<>=]+)?$/", $filter)) { list($table, $field) = explode(".", $filter); } elseif (preg_match('/^[A-Z][A-Za-z]*$/', $filter)) { $table = $filter; $field = null; } - elseif (preg_match('/^\w+$/', $filter)) { + elseif (preg_match('/^\w+(\s*[!<>=]+)?$/', $filter)) { $table = $model->alias; $field = $filter; }