cvs: smarty /libs Smarty_Compiler.class.php

messju		Sun Jan 25 10:39:10 2004 EDT

  Modified files:              
    /smarty/libs	Smarty_Compiler.class.php 
  Log:
  Smarty_Compiler::_syntax_error() uses Smarty::_trigger_fatal_error() now instead of the trigger_error()-function
  
  
  
http://cvs.php.net/diff.php/smarty/libs/Smarty_Compiler.class.php?r1=1.309&r2=1.310&ty=u
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.309 smarty/libs/Smarty_Compiler.class.php:1.310
--- smarty/libs/Smarty_Compiler.class.php:1.309	Sun Jan 25 10:29:19 2004
+++ smarty/libs/Smarty_Compiler.class.php	Sun Jan 25 10:39:10 2004
@@ -39,7 +39,7 @@
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php,v 1.309 2004/01/25 15:29:19 messju Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.310 2004/01/25 15:39:10 messju Exp $ */
 
 /**
  * Template compiling class
@@ -561,7 +561,7 @@
                 } else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
                     return $output;                    
                 } else {
-                    $this->_syntax_error("unrecognized tag '$tag_command'", E_USER_WARNING, __FILE__, __LINE__);
+                    $this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__);
                 }
 
         }
@@ -2133,13 +2133,7 @@
      */
     function _syntax_error($error_msg, $error_type = E_USER_ERROR, $file=null, $line=null)
     {
-        if(isset($file) && isset($line)) {
-            $info = ' ('.basename($file).", line $line)";
-        } else {
-            $info = null;
-        }
-        trigger_error('Smarty: [in ' . $this->_current_file . ' line ' .
-                      $this->_current_line_no . "]: syntax error: $error_msg$info", $error_type);
+        $this->_trigger_fatal_error("syntax error: $error_msg", $this->_current_file, $this->_current_line_no, $file, $line, $error_type);
     }
 
 

-- 
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php