From dcc9c58577b90c408ea845e45a44159f9dc3fd29 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 23 Aug 2012 14:44:14 -0400 Subject: [PATCH] cc-3936: Sexified equal signs. --- airtime_mvc/application/controllers/UserController.php | 4 ++-- airtime_mvc/application/models/User.php | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php index 0c86e29eb..00040718e 100644 --- a/airtime_mvc/application/controllers/UserController.php +++ b/airtime_mvc/application/controllers/UserController.php @@ -70,8 +70,8 @@ class UserController extends Zend_Controller_Action public function getHostsAction() { - $search = $this->_getParam('term'); - $res = Application_Model_User::getHosts($search); + $search = $this->_getParam('term'); + $res = Application_Model_User::getHosts($search); $this->view->hosts = Application_Model_User::getHosts($search); } diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 88a7ba1c6..fc6e6a3cf 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -240,22 +240,23 @@ class Application_Model_User public static function getUsers(array $type, $search=null) { - $con = Propel::getConnection(); + $con = Propel::getConnection(); $sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs "; - $sql = $sql_gen; + $sql = $sql_gen; $type = array_map( function($t) { return "type = '{$type[$i]}'"; }, $type); + $sql_type = join(" OR ", $type); - $sql = $sql_gen ." WHERE (". $sql_type.") "; + $sql = $sql_gen ." WHERE (". $sql_type.") "; if (!is_null($search)) { $like = "login ILIKE '%{$search}%'"; - $sql = $sql . " AND ".$like; + $sql = $sql . " AND ".$like; } $sql = $sql ." ORDER BY login";