From: <gem...@li...> - 2011-11-29 08:14:58
|
Revision: 307 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=307&view=rev Author: michieltcs Date: 2011-11-29 08:14:48 +0000 (Tue, 29 Nov 2011) Log Message: ----------- Fallback if gor_accessible is not defined (yet) Modified Paths: -------------- branches/1.5.0-pulse/library/classes/Gems/User/Organization.php Modified: branches/1.5.0-pulse/library/classes/Gems/User/Organization.php =================================================================== --- branches/1.5.0-pulse/library/classes/Gems/User/Organization.php 2011-11-28 20:19:39 UTC (rev 306) +++ branches/1.5.0-pulse/library/classes/Gems/User/Organization.php 2011-11-29 08:14:48 UTC (rev 307) @@ -195,17 +195,21 @@ $data = $this->db->fetchRow($sql, $id); if ($data) { - $dbOrgId = $this->db->quote($id, Zend_Db::INT_TYPE); - $sql = "SELECT gor_id_organization, gor_name - FROM gems__organizations - WHERE gor_active = 1 AND - ( - gor_id_organization = $dbOrgId OR - gor_accessible_by LIKE '%:$dbOrgId:%' - ) - ORDER BY gor_name"; - $data['can_access'] = $this->db->fetchPairs($sql); - natsort($data['can_access']); + try { + $dbOrgId = $this->db->quote($id, Zend_Db::INT_TYPE); + $sql = "SELECT gor_id_organization, gor_name + FROM gems__organizations + WHERE gor_active = 1 AND + ( + gor_id_organization = $dbOrgId OR + gor_accessible_by LIKE '%:$dbOrgId:%' + ) + ORDER BY gor_name"; + $data['can_access'] = $this->db->fetchPairs($sql); + natsort($data['can_access']); + } catch (Exception $e) { + $data['can_access'] = array(); + } // MUtil_Echo::track($sql, $data['can_access']); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |