Changeset 2489 for trunk/include/template.class.php

Timestamp:

Aug 28, 2008, 3:26:26 AM (16 years ago)

Author:

rvelices

Message:

• removed and moved (from common to admin) some CSS rules
• upgraded jQuery and accordion to latest version (and reorganised a bit their location)

File:

• trunk/include/template.class.php (modified) (2 diffs)

trunk/include/template.class.php

@@ -242 +242 @@
     if ( !isset($this->files[$handle]) )
     {
-      die("Template->parse(): Couldn't load template file for handle $handle");
+      trigger_error("Template->parse(): Couldn't load template file for handle $handle", E_USER_ERROR);
     }
 
@@ -368 +368 @@
     foreach($tags as $tag)
     {
-      array_push($regex, "#^\s+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m");
-      array_push($regex, "#^\s+($ldq/$tag$rdq)\s*$#m");
+      array_push($regex, "#^[ \t]+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m");
+      array_push($regex, "#^[ \t]+($ldq/$tag$rdq)\s*$#m");
     }
     $tags = array('include', 'else', 'html_head');
     foreach($tags as $tag)
     {
-      array_push($regex, "#^\s+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m");
+      array_push($regex, "#^[ \t]+($ldq$tag"."[^$ld$rd]*$rdq)\s*$#m");
     }
     $source = preg_replace( $regex, "$1", $source);