[Fusionforge-commits] r15048 - branches/Branch_5_1/src/common/include

Thorsten Glaser mirabilos at fusionforge.org
Wed Feb 1 13:45:34 CET 2012


Author: mirabilos
Date: 2012-02-01 13:45:33 +0100 (Wed, 01 Feb 2012)
New Revision: 15048

Modified:
   branches/Branch_5_1/src/common/include/RBACEngine.class.php
Log:
allow to pass numeric user IDs (as r15047 will), not just user objects


Modified: branches/Branch_5_1/src/common/include/RBACEngine.class.php
===================================================================
--- branches/Branch_5_1/src/common/include/RBACEngine.class.php	2012-02-01 10:28:09 UTC (rev 15047)
+++ branches/Branch_5_1/src/common/include/RBACEngine.class.php	2012-02-01 12:45:33 UTC (rev 15048)
@@ -116,15 +116,17 @@
 		$result[] = RoleAnonymous::getInstance() ;
 		$result[] = RoleLoggedIn::getInstance() ;
 		
+		$uid = is_object($user) ? $user->getID() : $user;
+
 		if (USE_PFO_RBAC) {
 			$res = db_query_params ('SELECT role_id FROM pfo_user_role WHERE user_id=$1',
-						array ($user->getID()));
+						array ($uid));
 			while ($arr = db_fetch_array($res)) {
 				$result[] = $this->getRoleById ($arr['role_id']) ;
 			}
 		} else {
 			$res = db_query_params ('SELECT role_id FROM user_group WHERE user_id=$1',
-						array ($user->getID()));
+						array ($uid));
 			while ($arr = db_fetch_array($res)) {
 				$result[] = $this->getRoleById ($arr['role_id']) ;
 			}




More information about the Fusionforge-commits mailing list