Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 801)
+++ trunk/CHANGELOG	(revision 802)
@@ -12,6 +12,7 @@
 
 ------------------------------------- 2.7.0 -------------------------------------
 05-Apr-2008 Christian Sommer
+!	added workaround for template parser class
 !	moved functions to edit module CSS files into the WB core to avoid duplication of code
 !	minor layout change
 !	allowed the character "-" to be used in database names
Index: trunk/wb/include/phplib/template.inc
===================================================================
--- trunk/wb/include/phplib/template.inc	(revision 801)
+++ trunk/wb/include/phplib/template.inc	(revision 802)
@@ -1,4 +1,7 @@
 <?php
+
+// $Id$
+
 /*
  * Session Management for PHP3
  *
@@ -345,12 +348,14 @@
     $str = $this->get_var($parent);
     $reg = "/[ \t]*<!--\s+BEGIN $varname\s+-->\s*?\n?(\s*.*?\n?)\s*<!--\s+END $varname\s+-->\s*?\n?/sm";
     preg_match_all($reg, $str, $m);
+/* workaround to avoid problems with some WB files/modules (e.g. massmail)
     if (!isset($m[1][0])) {
       $this->halt("set_block: unable to set block $varname.");
       return false;
     }
+*/
     $str = preg_replace($reg, "{" . $name . "}", $str);
-    $this->set_var($varname, $m[1][0]);
+    @$this->set_var($varname, $m[1][0]);
     $this->set_var($parent, $str);
     return true;
   }