Update of /cvsroot/phplib/php-lib-stable/php
In directory usw-pr-cvs1:/tmp/cvs-serv13538
Modified Files:
template.inc
Log Message:
Merge in changes from -devel:
* changed debug handling so set, get and internals can be tracked separately (rha)
* added debug statements throughout to track most function calls (rha)
* debug output contained raw HTML -- is now escaped with htmlentities (rha)
* Alter regex in set_block to remove more whitespace around BEGIN/END tags to improve HTML layout (rha)
* Add "append" option to set_var, works just like append in parse (dale at linuxwebpro.com, rha)
* Altered parse so that append is honored if passed an array (Brian)
* Converted comments and documentation to phpdoc style (rha)
* Added clear_var to set the value of variables to "" (rha)
* Added unset_var to usset variables (rha)
Index: template.inc
===================================================================
RCS file: /cvsroot/phplib/php-lib-stable/php/template.inc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** template.inc 25 Apr 2002 12:49:17 -0000 1.11
--- template.inc 11 Jul 2002 22:29:51 -0000 1.12
***************
*** 23,27 ****
* set_unknowns had "keep" as default instead of "remove" (from phplib-devel)
* set_file failed to check for empty strings if passed an array of filenames (phplib-devel)
! * remove @ from call to preg_replace in subst -- report errors if there are any. (NickM)
* set_block unnecessarily required a newline in the template file (Marc Tardif)
* pparse now calls this->finish to replace undefined vars (Layne Weathers)
--- 23,27 ----
* set_unknowns had "keep" as default instead of "remove" (from phplib-devel)
* set_file failed to check for empty strings if passed an array of filenames (phplib-devel)
! * remove @ from call to preg_replace in subst -- report errors if there are any (NickM)
* set_block unnecessarily required a newline in the template file (Marc Tardif)
[...1132 lines suppressed...]
! */
function haltmsg($msg) {
printf("<b>Template Error:</b> %s<br>\n", $msg);
--- 946,961 ----
! /******************************************************************************
! * This function prints an error message.
! * It can be overridden by your subclass of Template. It will be called with an
! * error message to display.
! *
! * usage: haltmsg(string $msg)
! *
! * @param $msg a string containing the error message to display
! * @access public
! * @return void
! * @see halt
! */
function haltmsg($msg) {
printf("<b>Template Error:</b> %s<br>\n", $msg);
|
