From: <jon...@us...> - 2009-08-18 14:17:58
|
Revision: 20954 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20954&view=rev Author: jonnybradley Date: 2009-08-18 14:17:52 +0000 (Tue, 18 Aug 2009) Log Message: ----------- [FIX] Replacing Sylvie's fix from r20927 (apologies - a day of conflicts) Modified Paths: -------------- trunk/tiki-objectpermissions.php Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2009-08-18 14:13:55 UTC (rev 20953) +++ trunk/tiki-objectpermissions.php 2009-08-18 14:17:52 UTC (rev 20954) @@ -395,7 +395,7 @@ $groupName = $groupNames[$i]; $beneficiaries = ''; for( $j = 0; $j < count($groupInheritance); $j++) { - if (in_array($groupName, $groupInheritance[$j])) { + if (is_array($groupInheritance[$j]) && in_array($groupName, $groupInheritance[$j])) { $beneficiaries .= !empty($beneficiaries) ? ',' : ''; $beneficiaries .= 'input[name="perm['.$groupNames[$j].'][]"]'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |