Branch '2.3-stable' - 2 commits - kolab-webclient/kronolith release-notes.txt

[Gunnar Wrobel]

 kolab-webclient/kronolith/ChangeLog                                                         |    6 +++
 kolab-webclient/kronolith/kronolith.spec                                                    |    2 -
 kolab-webclient/kronolith/patches/kronolith-2.3.5/series                                    |    1 
 kolab-webclient/kronolith/patches/kronolith-2.3.5/t_kronolith_HK_GW_CorrectOrganizerFb.diff |   19 ++++++++++
 release-notes.txt                                                                           |    4 ++
 5 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 3f20fe03348e378b00d546177206c3302f16f064
Author: Gunnar Wrobel <p at rdus.de>
Date:   Mon Sep 12 07:28:33 2011 +0000

    Fix the F/B list of the organizer in the event attendee view.

diff --git a/release-notes.txt b/release-notes.txt
index ee6ae4b..9e21ec1 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -23,6 +23,10 @@ the 1st.README file in the package directory.
 
 	kolab/issue4690 (Umlaut problems in system folders)
 
+    - kronolith-2.3.5-20110912
+
+	Fix the F/B list of the organizer in the event attendee view.
+
     - Kolab_FreeBusy-0.5.2-20110826
 
 	kolab/issue4765 (Freebusy trigger fails if using localpart of user)


commit 8ddef0b37187bb49e6fd06e44d29076ff8f3422e
Author: Gunnar Wrobel <p at rdus.de>
Date:   Mon Sep 12 07:28:26 2011 +0000

    Fix the F/B list of the organizer in the event attendee view.

diff --git a/kolab-webclient/kronolith/ChangeLog b/kolab-webclient/kronolith/ChangeLog
index a7c8f1c..5437924 100644
--- a/kolab-webclient/kronolith/ChangeLog
+++ b/kolab-webclient/kronolith/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-12  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/kronolith-2.3.5/t_kronolith_HK_GW_CorrectOrganizerFb.diff
+
+	Fix the F/B list of the organizer in the event attendee view.
+
 2010-11-26  Gunnar Wrobel  <p at rdus.de>
 
 	* kronolith.spec: Update to 2.3.5.
diff --git a/kolab-webclient/kronolith/kronolith.spec b/kolab-webclient/kronolith/kronolith.spec
index 2c4f4d1..c5e3b27 100644
--- a/kolab-webclient/kronolith/kronolith.spec
+++ b/kolab-webclient/kronolith/kronolith.spec
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package kronolith
 %define         V_version 2.3.5
-%define         V_release 20101126
+%define         V_release 20110912
 
 # Package Information
 Name:		%{V_package}
diff --git a/kolab-webclient/kronolith/patches/kronolith-2.3.5/series b/kolab-webclient/kronolith/patches/kronolith-2.3.5/series
index dc542c1..ff42d1e 100644
--- a/kolab-webclient/kronolith/patches/kronolith-2.3.5/series
+++ b/kolab-webclient/kronolith/patches/kronolith-2.3.5/series
@@ -12,3 +12,4 @@ t_kronolith_HK_UV_SyncMLSyncBackendBeforeSync.diff
 t_SyncML_UV_RecurringEventsWeekCount.diff
 t_kronolith_HK_GW_ZpushAnnotations.diff
 t_kronolith_HK_GW_SendInvitationsByDefault.diff
+t_kronolith_HK_GW_CorrectOrganizerFb.diff
diff --git a/kolab-webclient/kronolith/patches/kronolith-2.3.5/t_kronolith_HK_GW_CorrectOrganizerFb.diff b/kolab-webclient/kronolith/patches/kronolith-2.3.5/t_kronolith_HK_GW_CorrectOrganizerFb.diff
new file mode 100644
index 0000000..57b25b6
--- /dev/null
+++ b/kolab-webclient/kronolith/patches/kronolith-2.3.5/t_kronolith_HK_GW_CorrectOrganizerFb.diff
@@ -0,0 +1,19 @@
+Patch by wrobel at pardus.de:
+
+Fix the F/B list of the organizer in the event attendee view.
+
+REF: NONE
+
+STATUS: SUBMIT
+
+--- a/attendees.php  2011-06-23 14:19:38.000000000 +0000
++++ b/attendees.php  2011-09-12 07:04:07.000000000 +0000
+@@ -232,7 +232,7 @@
+     }
+     $cal = array($cal);
+ }
+-$vfb = Kronolith_FreeBusy::generate($cal, null, null, true, Auth::getAuth());
++$vfb = Kronolith_FreeBusy::get(Auth::getAuth());
+ if (!is_a($vfb, 'PEAR_Error')) {
+     $attendee_view->addRequiredMember($vfb);
+ } else {