Author: jfthomps
Date: Fri Mar 13 14:08:41 2009
New Revision: 753277
URL: http://svn.apache.org/viewvc?rev=753277&view=rev
Log:
VCL-51
modified printUserPrivRow and getUserPrivRowHTML to use the array + operator
instead of array_merge to create $allprivs; array_merge reindexes any numeric
keys when combining the arrays which resulted in numeric group names that were
keys being changed
Modified:
incubator/vcl/trunk/web/.ht-inc/privileges.php
Modified: incubator/vcl/trunk/web/.ht-inc/privileges.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/privileges.php?rev=753277&r1=753276&r2=753277&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/privileges.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/privileges.php Fri Mar 13 14:08:41 2009
@@ -1354,7 +1354,7 @@
////////////////////////////////////////////////////////////////////////////////
function printUserPrivRow($privname, $rownum, $privs, $types,
$cascadeprivs, $usergroup, $disabled) {
- $allprivs = array_merge($privs, $cascadeprivs);
+ $allprivs = $cascadeprivs + $privs;
print " <TR>\n";
if($usergroup == 'group' && !
empty($allprivs[$privname]['affiliation']))
print "
<TH>$privn...@{$allprivs[$privname]['affiliation']}</TH>\n";
@@ -1483,7 +1483,7 @@
////////////////////////////////////////////////////////////////////////////////
function getUserPrivRowHTML($privname, $rownum, $privs, $types,
$cascadeprivs, $usergroup, $disabled) {
- $allprivs = array_merge($privs, $cascadeprivs);
+ $allprivs = $cascadeprivs + $privs;
$text = "";
$js = "";
$text .= " <TR>";
