[debian-edu-commits] debian-edu/pkg-team/ 03/04: debian/patches: Another fix for 1026_fix-deprecated-constructor-format.patch. Don't replace xml::xml2array by flawed xml::__construct2array.

[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 6c6d89576f0db2b9ea6a55da3eef80a0ff7ef413
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Jun 2 23:49:40 2016 +0200

    debian/patches: Another fix for 1026_fix-deprecated-constructor-format.patch. Don't replace xml::xml2array by flawed xml::__construct2array.
---
 .../1026_fix-deprecated-constructor-format.patch       | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/debian/patches/1026_fix-deprecated-constructor-format.patch b/debian/patches/1026_fix-deprecated-constructor-format.patch
index 710be06..ac33ab8 100644
--- a/debian/patches/1026_fix-deprecated-constructor-format.patch
+++ b/debian/patches/1026_fix-deprecated-constructor-format.patch
@@ -959,15 +959,6 @@ Abstract:
      {
          global $config;
  
-@@ -55,7 +55,7 @@
-     function load($filename)
-     {
-         $contents = file_get_contents($filename);
--        $xmlData= xml::xml2array($contents, 1);
-+        $xmlData= xml::__construct2array($contents, 1);
- 
-         if (!isset($xmlData['filterdef'])) {
-             return false;
 --- a/gosa-core/include/class_ldap.inc
 +++ b/gosa-core/include/class_ldap.inc
 @@ -55,7 +55,7 @@
@@ -990,15 +981,6 @@ Abstract:
      {
          global $config;
          global $class_mapping;
-@@ -162,7 +162,7 @@
- 
-     function loadString($contents)
-     {
--        $this->xmlData= xml::xml2array($contents, 1);
-+        $this->xmlData= xml::__construct2array($contents, 1);
- 
-         if (!isset($this->xmlData['list'])) {
-             return false;
 --- a/gosa-core/include/class_log.inc
 +++ b/gosa-core/include/class_log.inc
 @@ -42,7 +42,7 @@

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