Update of /cvsroot/phplib/php-lib/php/ext
In directory usw-pr-cvs1:/tmp/cvs-serv12578
Modified Files:
template.inc
Log Message:
edit change log in preparation for merge into -stable
Index: template.inc
===================================================================
RCS file: /cvsroot/phplib/php-lib/php/ext/template.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** template.inc 11 Jul 2002 22:20:28 -0000 1.9
--- template.inc 11 Jul 2002 22:27:54 -0000 1.10
***************
*** 11,19 ****
/*
! * Change log since version 7.2d
* Bug fixes to version 7.2c compiled by Richard Archer <rh...@ju...>:
* (credits given to first person to post a diff to phplib mailing list)
*
! * Normalised all comments and whitespace
* replaced "$handle" with "$varname" and "$h" with "$v" throughout (from phplib-devel)
* added braces around all one-line if statements in: get_undefined, loadfile and halt (rha)
--- 11,20 ----
/*
! * Change log since version 7.2c
! *
* Bug fixes to version 7.2c compiled by Richard Archer <rh...@ju...>:
* (credits given to first person to post a diff to phplib mailing list)
*
! * Normalised all comments and whitespace (rha)
* replaced "$handle" with "$varname" and "$h" with "$v" throughout (from phplib-devel)
* added braces around all one-line if statements in: get_undefined, loadfile and halt (rha)
***************
*** 22,26 ****
* 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)
* pparse now calls this->finish to replace undefined vars (Layne Weathers)
***************
*** 30,36 ****
* in finish, the replacement string referenced an unset variable (rha)
* loadfile would try to load a file if the varval had been set to "" (rha)
! * in get_undefined, only match non-whitespace in variable tags as in finish. (Layne Weathers & rha)
* more elegant fix to the problem of subst stripping '$n', '\n' and '\\' strings (rha)
*
* changed debug handling so set, get and internals can be tracked separately (rha)
* added debug statements throughout to track most function calls (rha)
--- 31,40 ----
* in finish, the replacement string referenced an unset variable (rha)
* loadfile would try to load a file if the varval had been set to "" (rha)
! * in get_undefined, only match non-whitespace in variable tags as in finish (Layne Weathers & rha)
* more elegant fix to the problem of subst stripping '$n', '\n' and '\\' strings (rha)
*
+ *
+ * Changes in functionality which go beyond bug fixes:
+ *
* changed debug handling so set, get and internals can be tracked separately (rha)
* added debug statements throughout to track most function calls (rha)
***************
*** 39,45 ****
* 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)
*
*/
--- 43,49 ----
* 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)
*
*/
|
