[Gemstracker-svn] SF.net SVN: gemstracker:[312] trunk

[<gem...@li...>]

Revision: 312
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=312&view=rev
Author:   michieltcs
Date:     2011-11-29 11:15:11 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Merge

Modified Paths:
--------------
    trunk/library/classes/Gems/User/Organization.php

Property Changed:
----------------
    trunk/
    trunk/library/
    trunk/library/classes/Gems/User/UserPasswordValidator.php


Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/1.5.0-pulse:306-311
/tags/1.5.0beta1:305


Property changes on: trunk/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/newUser:113-150
/branches/newUser2:175-207
   + /branches/1.5.0-pulse/library:306-311
/branches/newUser:113-150
/branches/newUser2:175-207
/tags/1.5.0beta1/library:305

Modified: trunk/library/classes/Gems/User/Organization.php
===================================================================
--- trunk/library/classes/Gems/User/Organization.php	2011-11-29 10:58:17 UTC (rev 311)
+++ trunk/library/classes/Gems/User/Organization.php	2011-11-29 11:15:11 UTC (rev 312)
@@ -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 {


Property changes on: trunk/library/classes/Gems/User/UserPasswordValidator.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/newUser/classes/Gems/User/UserPasswordValidator.php:113-150
/branches/newUser2/classes/Gems/User/UserPasswordValidator.php:175-207

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.