From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.

---
 interface/lib/classes/tpl.inc.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/lib/classes/tpl.inc.php b/interface/lib/classes/tpl.inc.php
index a922007..3bd310f 100644
--- a/interface/lib/classes/tpl.inc.php
+++ b/interface/lib/classes/tpl.inc.php
@@ -1226,10 +1226,10 @@
          */
         private function _intParse ()
         {
-            $mqrt = get_magic_quotes_runtime();
-            set_magic_quotes_runtime(0);
+            //$mqrt = get_magic_quotes_runtime();
+            //set_magic_quotes_runtime(0);
             $this->_tmplfilep = '?>'.$this->_getData($this->_tmplfilename).'<?php return true;';
-            set_magic_quotes_runtime($mqrt);
+            //set_magic_quotes_runtime($mqrt);
             return true;
         }
 

--
Gitblit v1.9.1