[debian-edu-commits] debian-edu/pkg-team/ 01/01: Fixup PHP syntax in 1010_fix-entry-removal-in-mail-plugin.patch. See #796823 for the details.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch debian/jessie/updates
in repository gosa.

commit 10f0d5c49ac2e31cd375c7b6d024874cefa0ea3b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri May 20 18:09:27 2016 +0200

    Fixup PHP syntax in 1010_fix-entry-removal-in-mail-plugin.patch. See #796823 for the details.
---
 debian/changelog                                           |  7 ++++++-
 debian/patches/1010_fix-entry-removal-in-mail-plugin.patch | 12 +++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe669e8..6ec14e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 gosa (2.7.4+reloaded2-1+deb8u2) jessie-proposed-updates; urgency=medium
 
+  [ Mike Gabriel ]
   * debian/patches:
     + Add 1009_fix-insertDhcp-icon-in-dhcp-section-overview.patch. Fix
       label stripping in GOsa²'s image() function. This fixes displaying the
@@ -21,7 +22,11 @@ gosa (2.7.4+reloaded2-1+deb8u2) jessie-proposed-updates; urgency=medium
       one-level domains in email addresses (such as <uid>@intern, as used
       in Debian Edu by default). (Closes: #794738).
 
- -- Mike Gabriel <sunweaver at debian.org>  Mon, 24 Aug 2015 21:23:29 +0200
+  [ Holger Levsen ]
+  * Fixup PHP syntax in 1010_fix-entry-removal-in-mail-plugin.patch. See
+    #796823 for the details.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 20 May 2016 18:08:59 +0200
 
 gosa (2.7.4+reloaded2-1+deb8u1) jessie-proposed-updates; urgency=medium
 
diff --git a/debian/patches/1010_fix-entry-removal-in-mail-plugin.patch b/debian/patches/1010_fix-entry-removal-in-mail-plugin.patch
index 80f264f..d3843c3 100644
--- a/debian/patches/1010_fix-entry-removal-in-mail-plugin.patch
+++ b/debian/patches/1010_fix-entry-removal-in-mail-plugin.patch
@@ -10,12 +10,14 @@ Abstract:
 
 --- a/mail/admin/groups/mail/class_groupMail.inc
 +++ b/mail/admin/groups/mail/class_groupMail.inc
-@@ -394,7 +394,7 @@
+@@ -393,8 +393,8 @@
+                 }
              }
          }
-         if (isset($_POST['delete_forwarder'])){
+-        if (isset($_POST['delete_forwarder'])){
 -            $this->delForwarder (get_post('forwarder_list'));
-+            $this->delForwarder ($_POST('forwarder_list'));
++        if (isset($_POST['delete_forwarder']) && isset($_POST['forwarder_list'])){
++            $this->delForwarder ($_POST['forwarder_list']);
          }
  
  
@@ -24,7 +26,7 @@ Abstract:
          }
          if (isset($_POST['delete_alternate']) && isset($_POST['alternates_list'])){
 -            $this->delAlternate (get_post('alternates_list'));
-+            $this->delAlternate ($_POST('alternates_list'));
++            $this->delAlternate ($_POST['alternates_list']);
          }
  
- 
\ No newline at end of file
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git