Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 server/lib/classes/tpl.inc.php

@@ -928,9 +928,9 @@
                $regex.=    '[\"\']?';
                $regex.= ')?\s*';
                $regex.= '(?:>|\/>|}|-->){1}';
            $regex.= '/ie';
            $regex.= '/i';
                //$regex.= '([\r\n|\n|\r])?/ie';
                $data = preg_replace($regex,"\$this->_parseTag(array('\\0','\\1','\\2','\\3','\\4','\\5','\\6','\\7','\\8','\\9'));",$data);
                $data = preg_replace_callback($regex, array($this, '_parseTag'), $data);

                if ($this->_cache) { // add cache if need be
                    $this->_createCache($data);