cvs: pear /LiveUser_Admin/Perm Complex.php
| From: | Helgi �ormar �orbj�rnsson | Date: | Mon, 28 Mar 2005 20:39:28 +0000 |
| Subject: | cvs: pear /LiveUser_Admin/Perm Complex.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-30744@lists.php.net to get a copy of this message | ||
dufuz Mon Mar 28 15:39:28 2005 EDT
Modified files:
/pear/LiveUser_Admin/Perm Complex.php
Log:
Bug #3976 LiveUser_Admin_Perm_Complex _getInheritedRights(), unsetting perm_user_id instead of
casting it to null
http://cvs.php.net/diff.php/pear/LiveUser_Admin/Perm/Complex.php?r1=1.56&r2=1.57&ty=u
Index: pear/LiveUser_Admin/Perm/Complex.php
diff -u pear/LiveUser_Admin/Perm/Complex.php:1.56 pear/LiveUser_Admin/Perm/Complex.php:1.57
--- pear/LiveUser_Admin/Perm/Complex.php:1.56 Thu Mar 24 11:32:46 2005
+++ pear/LiveUser_Admin/Perm/Complex.php Mon Mar 28 15:39:27 2005
@@ -57,7 +57,7 @@
* @author Bjoern Kraus <krausbn@php.net>
* @copyright 2002-2005 Markus Wolff
* @license http://www.gnu.org/licenses/lgpl.txt
- * @version CVS: $Id: Complex.php,v 1.56 2005/03/24 16:32:46 lsmith Exp $
+ * @version CVS: $Id: Complex.php,v 1.57 2005/03/28 20:39:27 dufuz Exp $
* @link http://pear.php.net/LiveUser_Admin
*/
@@ -904,9 +904,9 @@
return false;
}
+ unset($params['filters']['perm_user_id']);
$_rights = array();
foreach ($result as $row) {
- $params['filters']['perm_user_id'] = null;
$params['filters']['group_id'] = $row['group_id'];
$inherited_rights = $this->getRights($params);
if ($inherited_rights === false) {