2 commits - plugins/kolab_addressbook plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Fri Jul 6 15:45:59 CEST 2012


 plugins/kolab_addressbook/skins/larry/templates/bookedit.html |    2 --
 plugins/libkolab/lib/kolab_format_distributionlist.php        |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 008d4b7941afb54cd04d83776932313419583e01
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri Jul 6 15:44:12 2012 +0200

    Remove cruft from HTML template

diff --git a/plugins/kolab_addressbook/skins/larry/templates/bookedit.html b/plugins/kolab_addressbook/skins/larry/templates/bookedit.html
index 9a91337..2037889 100644
--- a/plugins/kolab_addressbook/skins/larry/templates/bookedit.html
+++ b/plugins/kolab_addressbook/skins/larry/templates/bookedit.html
@@ -12,11 +12,9 @@
   <roundcube:object name="bookdetails" class="propform tabbed" />
 </div>
 
-<div id="formfooter">
 <div class="footerleft formbuttons">
 	<roundcube:button command="book-save" type="input" class="button mainaction" label="save" />
 </div>
-</div>
 
 <roundcube:include file="/includes/footer.html" />
 


commit 2015c6a23efdd9b77041ca69c50b31a03995f088
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri Jul 6 15:43:38 2012 +0200

    Cast to array to avoid warning on bogus data (#869)

diff --git a/plugins/libkolab/lib/kolab_format_distributionlist.php b/plugins/libkolab/lib/kolab_format_distributionlist.php
index fe99804..d060b57 100644
--- a/plugins/libkolab/lib/kolab_format_distributionlist.php
+++ b/plugins/libkolab/lib/kolab_format_distributionlist.php
@@ -55,7 +55,7 @@ class kolab_format_distributionlist extends kolab_format
 
         $seen = array();
         $members = new vectorcontactref;
-        foreach ($object['member'] as $member) {
+        foreach ((array)$object['member'] as $member) {
             if ($member['uid'])
                 $m = new ContactReference(ContactReference::UidReference, $member['uid']);
             else if ($member['email'])
@@ -92,7 +92,7 @@ class kolab_format_distributionlist extends kolab_format
             'member'  => array(),
         );
 
-        foreach ($record['member'] as $member) {
+        foreach ((array)$record['member'] as $member) {
             $object['member'][] = array(
                 'email' => $member['smtp-address'],
                 'name' => $member['display-name'],





More information about the commits mailing list