[debian-edu-commits] debian-edu/pkg-team/ 01/17: debian/patches: Add 1031_no-context-loose-continues.patch. Avoid stray continue expression. (Closes: #879105).

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository gosa.

commit be2cfd24035ee019d171ebb3d7d31a27edc0bb69
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 12:29:53 2018 +0100

    debian/patches: Add 1031_no-context-loose-continues.patch. Avoid stray continue expression. (Closes: #879105).
---
 debian/patches/1031_no-context-loose-continues.patch | 17 +++++++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 18 insertions(+)

diff --git a/debian/patches/1031_no-context-loose-continues.patch b/debian/patches/1031_no-context-loose-continues.patch
new file mode 100644
index 0000000..6bbfe43
--- /dev/null
+++ b/debian/patches/1031_no-context-loose-continues.patch
@@ -0,0 +1,17 @@
+Description: Avoid stray continue. Fails with PHP7.
+Author: Benjamin Zapiec <bzapiec at gonicus.de>
+
+--- a/mail/admin/groups/mail/class_groupMail.inc
++++ b/mail/admin/groups/mail/class_groupMail.inc
+@@ -1164,7 +1164,10 @@
+      */
+     function addAlternate($address)
+     {
+-        if(empty($address)) continue;
++        if(empty($address)) {
++            return "";
++        }
++
+         $ldap= $this->config->get_ldap_link();
+ 
+         $address= strtolower($address);
diff --git a/debian/patches/series b/debian/patches/series
index 26c5199..db5633d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,6 +35,7 @@
 1028_use-mysqli-instead-of-mysql.patch
 1029_better-whitespace-cleanup-in-genuid.patch
 1030_column-header-titles-group-members.patch
+1031_no-context-loose-continues.patch
 2001_fix-smarty-location.patch
 2002_fix-template-location.patch
 2003_fix-class-mapping.patch

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