DataObjects/Core_locking.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index 6ae22b1..08f2343 100644 (file)
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -120,7 +120,7 @@ class Pman_Core_JsTemplate extends Pman {
                     continue;
                 
                 case ($inscript && ($item != '{end:}')):
-                    $ret[] = $item;
+                    $ret[count($ret)-1] .= $item;
                     continue;
                 
                 case ($inscript && ($item == '{end:}')):
@@ -138,6 +138,7 @@ class Pman_Core_JsTemplate extends Pman {
                 
                 case ($item == '{script:}'): 
                     $inscript = true;
+                     $ret[] = '';
                     continue;
                 
                 case ($item[1] == '!'):
@@ -150,7 +151,7 @@ class Pman_Core_JsTemplate extends Pman {
                     $indent++;
                     continue;
                 
-                case (substr($item,1,4) == 'else:'):
+                case (substr($item,1,5) == 'else:'):
                     $indent--;
                     $in = str_repeat("    ", $indent);
                     $ret[] = $in . "} else { ";