From 6c5c0a156ef4473e23f54e28ef2625a1c3ceda38 Mon Sep 17 00:00:00 2001
From: "Uwe.Tews" <uwe.tews@localhost>
Date: Thu, 10 Sep 2009 23:08:06 +0000
Subject: [PATCH] - bugfix for very large {block} tag content

---
 libs/sysplugins/internal.compile_extend.php | 32 +++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/libs/sysplugins/internal.compile_extend.php b/libs/sysplugins/internal.compile_extend.php
index ea90c6ea..1d539b9a 100644
--- a/libs/sysplugins/internal.compile_extend.php
+++ b/libs/sysplugins/internal.compile_extend.php
@@ -35,46 +35,48 @@ class Smarty_Internal_Compile_Extend extends Smarty_Internal_CompileBase {
         $compiler->template->properties['file_dependency'][] = array($_template->getTemplateFilepath(), $_template->getTemplateTimestamp()); 
         // $_old_source = preg_replace ('/' . $this->smarty->left_delimiter . 'extend\s+(?:file=)?\s*(\S+?|(["\']).+?\2)' . $this->smarty->right_delimiter . '/i', '' , $compiler->template->template_source, 1);
         $_old_source = $compiler->template->template_source;
-        if (preg_match_all('/(' . $this->compiler->smarty->left_delimiter . 'block(.+?)' . $this->compiler->smarty->right_delimiter . ')/', $_old_source, $dummy) !=
-                preg_match_all('/(' . $this->compiler->smarty->left_delimiter . '\/block(.*?)' . $this->compiler->smarty->right_delimiter . ')/', $_old_source, $dummy)) {
+        if (preg_match_all('/(' . $this->compiler->smarty->left_delimiter . 'block(.+?)' . $this->compiler->smarty->right_delimiter . ')/', $_old_source, $s, PREG_OFFSET_CAPTURE) !=
+                preg_match_all('/(' . $this->compiler->smarty->left_delimiter . '\/block(.*?)' . $this->compiler->smarty->right_delimiter . ')/', $_old_source, $c, PREG_OFFSET_CAPTURE)) {
             $this->compiler->trigger_template_error(" unmatched {block} {/block} pairs");
         } 
-        $_old_source = preg_replace_callback('/(' . $this->compiler->smarty->left_delimiter . 'block(.+?)' . $this->compiler->smarty->right_delimiter . ')((?:\r?\n?)(.*?)(?:\r?\n?))(' . $this->compiler->smarty->left_delimiter . '\/block(.*?)' . $this->compiler->smarty->right_delimiter . ')/is', array($this, 'saveBlockData'), $_old_source);
+        $block_count = count($s[0]);
+        for ($i = 0; $i < $block_count; $i++) {
+            $block_content = substr($_old_source, $s[0][$i][1], $c[0][$i][1] + strlen($c[0][$i][0]) - $s[0][$i][1]);
+            $this->saveBlockData($block_content, $s[0][$i][0]);
+        } 
         $compiler->template->template_source = $_template->getTemplateSource();
         $compiler->abort_and_recompile = true;
         return ' ';
     } 
 
-    protected function saveBlockData(array $matches)
+    protected function saveBlockData($block_content, $block_tag)
     {
-        if (0 == preg_match('/(.?)(name=)([^ ]*)/', $matches[2], $_match)) {
-            $this->compiler->trigger_template_error("\"" . $matches[0] . "\" missing name attribute");
+        if (0 == preg_match('/(.?)(name=)([^ ]*)/', $block_tag, $_match)) {
+            $this->compiler->trigger_template_error("\"" . $block_tag . "\" missing name attribute");
         } else {
             // compile block content
-            $_tpl = $this->compiler->smarty->createTemplate('string:' . $matches[3]);
+            $_tpl = $this->compiler->smarty->createTemplate('string:' . $block_content);
             $_tpl->template_filepath = $this->compiler->template->getTemplateFilepath();
             $_tpl->suppressHeader = true;
             $_compiled_content = $_tpl->getCompiledTemplate();
             unset($_tpl);
-            $_name = trim($_match[3], "\"'");
+            $_name = trim($_match[3], "\"'}");
 
             if (isset($this->compiler->template->block_data[$_name])) {
                 if ($this->compiler->template->block_data[$_name]['mode'] == 'prepend') {
                     $this->compiler->template->block_data[$_name]['compiled'] .= $_compiled_content;
-                    $this->compiler->template->block_data[$_name]['source'] .= $matches[3];
+                    $this->compiler->template->block_data[$_name]['source'] .= $block_content;
                 } elseif ($this->compiler->template->block_data[$_name]['mode'] == 'append') {
                     $this->compiler->template->block_data[$_name]['compiled'] = $_compiled_content . $this->compiler->template->block_data[$_name]['compiled'];
-                    $this->compiler->template->block_data[$_name]['source'] = $matches[3] . $this->compiler->template->block_data[$_name]['source'];
+                    $this->compiler->template->block_data[$_name]['source'] = $block_content . $this->compiler->template->block_data[$_name]['source'];
                 } 
             } else {
                 $this->compiler->template->block_data[$_name]['compiled'] = $_compiled_content;
-                $this->compiler->template->block_data[$_name]['source'] = $matches[3];
+                $this->compiler->template->block_data[$_name]['source'] = $block_content;
             } 
-            // if (isset($this->compiler->template->block_data[$_name]['mode'])) {
-            // if ($this->compiler->template->block_data[$_name]['mode'] != 'replace') {
-            if (preg_match('/(.?)(append=true)(.*)/', $matches[2], $_match) != 0) {
+            if (preg_match('/(.?)(append=true)(.*)/', $block_tag, $_match) != 0) {
                 $this->compiler->template->block_data[$_name]['mode'] = 'append';
-            } elseif (preg_match('/(.?)(prepend=true)(.*)/', $matches[2], $_match) != 0) {
+            } elseif (preg_match('/(.?)(prepend=true)(.*)/', $block_tag, $_match) != 0) {
                 $this->compiler->template->block_data[$_name]['mode'] = 'prepend'; 
                 // }
                 // }