From 4bcd9a2265b3b6669deb272829fa6b43871402e3 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 15 Jul 2014 15:18:41 +0000
Subject: [PATCH] Fix calendar Category ACL does not apply changes

---
 calendar/inc/class.calendar_uiforms.inc.php | 10 +++++-----
 calendar/templates/default/cat_acl.xet      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 954ff3b539..4e2e73e834 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -2313,7 +2313,7 @@ class calendar_uiforms extends calendar_ui
 			unset($content['button']);
 			if ($button != 'cancel')	// store changed acl
 			{
-				foreach($content['rows'] as $data)
+				foreach($content as $data)
 				{
 					if (!($cat_id = $data['cat_id'])) continue;
 					foreach(array_merge((array)$data['add'],(array)$data['status'],array_keys((array)$data['old'])) as $account_id)
@@ -2330,7 +2330,7 @@ class calendar_uiforms extends calendar_ui
 				egw::redirect_link('/admin/index.php', null, 'admin');
 			}
 		}
-		$content['rows'] = $preserv['rows'] = array();
+		$content= $preserv = array();
 		$n = 1;
 		foreach($this->bo->get_cat_rights() as $Lcat_id => $data)
 		{
@@ -2345,8 +2345,8 @@ class calendar_uiforms extends calendar_ui
 				if ($rights & calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
 				if ($rights & calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
 			}
-			$content['rows'][$n] = $row;
-			$preserv['rows'][$n] = array(
+			$content[$n] = $row;
+			$preserv[$n] = array(
 				'cat_id' => $cat_id,
 				'old' => $data,
 			);
@@ -2354,7 +2354,7 @@ class calendar_uiforms extends calendar_ui
 			++$n;
 		}
 		// add empty row for new entries
-		$content['rows'][] = array('cat_id' => '');
+		$content[] = array('cat_id' => '');
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Calendar').' - '.lang('Category ACL');
 		$tmp = new etemplate_new('calendar.cat_acl');
diff --git a/calendar/templates/default/cat_acl.xet b/calendar/templates/default/cat_acl.xet
index 3a4a6e095a..f3ef22a3d3 100644
--- a/calendar/templates/default/cat_acl.xet
+++ b/calendar/templates/default/cat_acl.xet
@@ -6,7 +6,7 @@
 			<caption label="Category ACL"/>
 			<description value="Category ACL only restrict adding a category to an event or changing status of a participant. It does NOT change the visibility of an event!"/>
 		</groupbox>
-		<grid id="rows">
+		<grid>
 			<columns>
 				<column/>
 				<column/>