[debian-edu-commits] debian-edu/pkg-team/ 01/01: debian/patches: Improve 1007_gen-uids-like-gosa26.patch. Avoid undefined index PHP error.

[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 952d196bab1da4add1761dd643084843e7353cd0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 24 23:37:28 2016 +0200

    debian/patches: Improve 1007_gen-uids-like-gosa26.patch. Avoid undefined index PHP error.
---
 debian/patches/1007_gen-uids-like-gosa26.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/patches/1007_gen-uids-like-gosa26.patch b/debian/patches/1007_gen-uids-like-gosa26.patch
index d6f0f0b..8641277 100644
--- a/debian/patches/1007_gen-uids-like-gosa26.patch
+++ b/debian/patches/1007_gen-uids-like-gosa26.patch
@@ -5,16 +5,20 @@ Abstract:
 
 --- a/gosa-core/include/functions.inc
 +++ b/gosa-core/include/functions.inc
-@@ -3815,7 +3815,7 @@
+@@ -3814,8 +3814,11 @@
+     $replacements = array(); 
      foreach($matches as $match){
          
++        # initialize the match's replacement array...
++        $replacements[$match[0]] = array();
++
          // No start position given, then add the complete value
 -        if(!isset($match[5])){
 +        if(!isset($match[7])){
              $replacements[$match[0]][] = $attributes[$match[2]];
      
          // Start given but no end, so just add a single character
-@@ -3831,10 +3831,16 @@
+@@ -3831,10 +3834,16 @@
              for($i=$match[5]; $i<= $match[7]; $i++){
                  if(isset($attributes[$match[2]][$i])){
                      $tmp = " ".$attributes[$match[2]];

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