cvs: smarty /libs Smarty_Compiler.class.php

messju		Thu Jan 29 05:38:13 2004 EDT

  Modified files:              
    /smarty/libs	Smarty_Compiler.class.php 
  Log:
  added file and line-number-information to error-messages regarding
  assigned objects an an error messages regarding modifiers with
  security.
  
  
  
http://cvs.php.net/diff.php/smarty/libs/Smarty_Compiler.class.php?r1=1.311&r2=1.312&ty=u
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.311 smarty/libs/Smarty_Compiler.class.php:1.312
--- smarty/libs/Smarty_Compiler.class.php:1.311	Tue Jan 27 18:00:26 2004
+++ smarty/libs/Smarty_Compiler.class.php	Thu Jan 29 05:38:12 2004
@@ -39,7 +39,7 @@
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php,v 1.311 2004/01/27 23:00:26 messju Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.312 2004/01/29 10:38:12 messju Exp $ */
 
 /**
  * Template compiling class
@@ -849,9 +849,9 @@
         $postfix = '';
         $newline = '';
         if(!is_object($this->_reg_objects[$object][0])) {
-            $this->_trigger_fatal_error("registered '$object' is not an object");
+            $this->_trigger_fatal_error("registered '$object' is not an object" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
         } elseif(!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
-            $this->_trigger_fatal_error("'$obj_comp' is not a registered component of object '$object'");
+            $this->_trigger_fatal_error("'$obj_comp' is not a registered component of object '$object'", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
         } elseif(method_exists($this->_reg_objects[$object][0], $obj_comp)) {
             // method
             if(in_array($obj_comp, $this->_reg_objects[$object][3])) {
@@ -1891,7 +1891,7 @@
                 && !$this->_get_plugin_filepath('modifier', $_modifier_name)
                 && function_exists($_modifier_name)) {
                 if ($this->security && !in_array($_modifier_name, $this->security_settings['MODIFIER_FUNCS'])) {
-                    $this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed" , $_tpl_file, $_tpl_line, __FILE__, __LINE__);
+                    $this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
                 } else {
                     $this->_plugins['modifier'][$_modifier_name] = array($_modifier_name,  null, null, false);
                 }

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