[PHPLIB-DEV] cvs commit From: kir (phplib-dev <email protected>)
Date: 04/10/00

From: kir
Date: Mon Apr 10 16:36:38 2000
Modified files:
      php-lib/CHANGES
      php-lib/php/template.inc

Log message:

  - Avoid warning in implode_block (class Template) in high
    error_reporting mode when halt_on_error="no"

Index: php-lib/CHANGES
diff -u php-lib/CHANGES:1.170 php-lib/CHANGES:1.171
--- php-lib/CHANGES:1.170 Mon Apr 10 12:06:46 2000
+++ php-lib/CHANGES Mon Apr 10 16:36:36 2000
@@ -1,4 +1,8 @@
-$Id: CHANGES,v 1.170 2000/04/10 10:06:46 kk Exp $
+$Id: CHANGES,v 1.171 2000/04/10 14:36:36 kir Exp $
+
+10-Apr-2000 kir
+ - Avoid warning in implode_block (class Template) in high
+ error_reporting mode when halt_on_error="no"
 
 10-Apr-2000 kk
   - Stricter regex for variable names in Template: [A-Za-z0-9_]+
Index: php-lib/php/template.inc
diff -u php-lib/php/template.inc:1.18 php-lib/php/template.inc:1.19
--- php-lib/php/template.inc:1.18 Mon Apr 10 13:00:09 2000
+++ php-lib/php/template.inc Mon Apr 10 16:36:37 2000
@@ -5,7 +5,7 @@
  * (C) Copyright 1999 NetUSE GmbH
  * Kristian Koehntopp
  *
- * $Id: template.inc,v 1.18 2000/04/10 11:00:09 uw Exp $
+ * $Id: template.inc,v 1.19 2000/04/10 14:36:37 kir Exp $
  *
  */
 
@@ -392,19 +392,21 @@
     {
         $this->halt("implode_block - no match for $varname variable");
     }
-
- /* implode the subblock to the requested alias */
- $str = preg_replace($reg, "{"."$alias}", $str);
-
- if ($this->debug & 4)
+ else
     {
- printf("<b>implode_block:</b> extract <b>$varname</b> from <b>$parent</b>, leaving {"."$alias}<br>\n");
- }
- //end change
-
- /* update variables */
- $this->set_var($varname, $m[1][0]);
- $this->set_var($parent, $str);
+ /* implode the subblock to the requested alias */
+ $str = preg_replace($reg, "{"."$alias}", $str);
+
+ if ($this->debug & 4)
+ {
+ printf("<b>implode_block:</b> extract <b>$varname</b> from <b>$parent</b>, leaving {"."$alias}<br>\n");
+ }
+ //end change
+
+ /* update variables */
+ $this->set_var($varname, $m[1][0]);
+ $this->set_var($parent, $str);
+ }
   }
   
 

-
PHPLIB Developers Mailing List. Send messages to <phplib-dev <email protected>>.
To unsubscribe, send "unsubscribe" to <phplib-dev-request <email protected>> in
the body, not the subject, of your message.