[debian-edu-commits] debian-edu/pkg-team/ 01/01: debian/patches: Add 1025_fix-with-smarty-3-1-29.patch. Fix class auto-loading when GOsa is used under Smarty3 (>= 3.1.28).

Mike Gabriel sunweaver at debian.org
Wed Jun 1 10:30:56 UTC 2016


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

sunweaver pushed a commit to branch master
in repository gosa.

commit d381e5ddb7dc62c9d45fe708cb1b7b50e6d2f9b8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 1 12:24:22 2016 +0200

    debian/patches: Add 1025_fix-with-smarty-3-1-29.patch. Fix class auto-loading when GOsa is used under Smarty3 (>= 3.1.28).
---
 debian/patches/1025_fix-with-smarty-3-1-29.patch | 16 ++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 17 insertions(+)

diff --git a/debian/patches/1025_fix-with-smarty-3-1-29.patch b/debian/patches/1025_fix-with-smarty-3-1-29.patch
new file mode 100644
index 0000000..f0951dd
--- /dev/null
+++ b/debian/patches/1025_fix-with-smarty-3-1-29.patch
@@ -0,0 +1,16 @@
+Description: Fix class autoloading under smarty3 3.1.28
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/gosa-core/include/functions.inc	2016-06-01 12:18:33.828156879 +0200
++++ b/gosa-core/include/functions.inc	2016-06-01 12:17:02.412145619 +0200
+@@ -152,6 +152,10 @@
+ 	    exit;
+     }
+ 
++    if (preg_match('/^Smarty_.*/', $class_name)) {
++        return;
++    }
++
+     if (isset($class_mapping["$class_name"])){
+       require_once($BASE_DIR."/".$class_mapping["$class_name"]);
+     } else {
diff --git a/debian/patches/series b/debian/patches/series
index e3e2330..7726936 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,6 +29,7 @@
 1022_add-b-switch-to-mkntpasswd-script.patch
 1023_check-smbhash-creation-for-base64-encoded-pws.patch
 1024_dont-overescape-dollar-signs-in-smb-passwords.patch
+1025_fix-with-smarty-3-1-29.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



More information about the debian-edu-commits mailing list