From e97e4969a05a3a43112fb327e4176a4455857ba5 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Fri, 15 Feb 2008 11:38:53 +0000 Subject: [PATCH] Upgrade to new smarty --- bundled-libs/Smarty/ChangeLog | 514 +++++++++++++++++- bundled-libs/Smarty/NEWS | 11 + bundled-libs/Smarty/README | 33 +- .../Smarty/libs/Config_File.class.php | 4 +- bundled-libs/Smarty/libs/Smarty.class.php | 52 +- .../Smarty/libs/Smarty_Compiler.class.php | 28 +- .../Smarty/libs/plugins/compiler.assign.php | 2 + .../libs/plugins/modifier.regex_replace.php | 10 +- docs/NEWS | 2 + 9 files changed, 603 insertions(+), 53 deletions(-) diff --git a/bundled-libs/Smarty/ChangeLog b/bundled-libs/Smarty/ChangeLog index 802891a..4dd5340 100644 --- a/bundled-libs/Smarty/ChangeLog +++ b/bundled-libs/Smarty/ChangeLog @@ -1,3 +1,515 @@ +2007-09-27 TAKAGI Masahiro + + * docs/ja/designers/language-custom-functions/language-function-html-checkboxes.xml: + sync with en. + +2007-09-27 Monte Ohrt + + * docs/en/designers/language-custom-functions/language-function-html-checkboxes.xml: + remove redundant attribute + +2007-09-18 Messju Mohr + + * docs/id/programmers/plugins/plugins-functions.xml: + removed errornous whitespace + +2007-09-18 Zaenal Mutaqin + + * docs/id/designers/language-basic-syntax/language-escaping.xml + docs/id/designers/language-basic-syntax/language-math.xml + docs/id/designers/language-basic-syntax/language-syntax-attributes.xml + docs/id/designers/language-basic-syntax/language-syntax-comments.xml + docs/id/designers/language-basic-syntax/language-syntax-functions.xml + docs/id/designers/language-basic-syntax/language-syntax-quotes.xml + docs/id/designers/language-basic-syntax/language-syntax-variables.xml + docs/id/designers/language-builtin-functions/language-function-capture.xml + docs/id/designers/language-builtin-functions/language-function-config-load.xml + docs/id/designers/language-builtin-functions/language-function-foreach.xml + docs/id/designers/language-builtin-functions/language-function-if.xml + docs/id/designers/language-builtin-functions/language-function-include-php.xml + docs/id/designers/language-builtin-functions/language-function-include.xml + docs/id/designers/language-builtin-functions/language-function-insert.xml + docs/id/designers/language-builtin-functions/language-function-ldelim.xml + docs/id/designers/language-builtin-functions/language-function-literal.xml + docs/id/designers/language-builtin-functions/language-function-php.xml + docs/id/designers/language-builtin-functions/language-function-section.xml + docs/id/designers/language-builtin-functions/language-function-strip.xml + docs/id/designers/language-custom-functions/language-function-assign.xml + docs/id/designers/language-custom-functions/language-function-counter.xml + docs/id/designers/language-custom-functions/language-function-cycle.xml + docs/id/designers/language-custom-functions/language-function-debug.xml + docs/id/designers/language-custom-functions/language-function-eval.xml + docs/id/designers/language-custom-functions/language-function-fetch.xml + docs/id/designers/language-custom-functions/language-function-html-checkboxes.xml + docs/id/designers/language-custom-functions/language-function-html-image.xml + docs/id/designers/language-custom-functions/language-function-html-options.xml + docs/id/designers/language-custom-functions/language-function-html-radios.xml + docs/id/designers/language-custom-functions/language-function-html-select-date.xml + docs/id/designers/language-custom-functions/language-function-html-select-time.xml + docs/id/designers/language-custom-functions/language-function-html-table.xml + docs/id/designers/language-custom-functions/language-function-mailto.xml + docs/id/designers/language-custom-functions/language-function-math.xml + docs/id/designers/language-custom-functions/language-function-popup-init.xml + docs/id/designers/language-custom-functions/language-function-popup.xml + docs/id/designers/language-custom-functions/language-function-textformat.xml + docs/id/designers/language-modifiers/language-modifier-capitalize.xml + docs/id/designers/language-modifiers/language-modifier-cat.xml + docs/id/designers/language-modifiers/language-modifier-count-characters.xml + docs/id/designers/language-modifiers/language-modifier-count-paragraphs.xml + docs/id/designers/language-modifiers/language-modifier-count-sentences.xml + docs/id/designers/language-modifiers/language-modifier-count-words.xml + docs/id/designers/language-modifiers/language-modifier-date-format.xml + docs/id/designers/language-modifiers/language-modifier-default.xml + docs/id/designers/language-modifiers/language-modifier-escape.xml + docs/id/designers/language-modifiers/language-modifier-indent.xml + docs/id/designers/language-modifiers/language-modifier-lower.xml + docs/id/designers/language-modifiers/language-modifier-nl2br.xml + docs/id/designers/language-modifiers/language-modifier-regex-replace.xml + docs/id/designers/language-modifiers/language-modifier-replace.xml + docs/id/designers/language-modifiers/language-modifier-spacify.xml + docs/id/designers/language-modifiers/language-modifier-string-format.xml + docs/id/designers/language-modifiers/language-modifier-strip-tags.xml + docs/id/designers/language-modifiers/language-modifier-strip.xml + docs/id/designers/language-modifiers/language-modifier-truncate.xml + docs/id/designers/language-modifiers/language-modifier-upper.xml + docs/id/designers/language-modifiers/language-modifier-wordwrap.xml + docs/id/designers/language-variables/language-assigned-variables.xml + docs/id/designers/language-variables/language-config-variables.xml + docs/id/designers/language-variables/language-variables-smarty.xml + docs/id/programmers/advanced-features/advanced-features-objects.xml + docs/id/programmers/advanced-features/advanced-features-outputfilters.xml + docs/id/programmers/advanced-features/advanced-features-postfilters.xml + docs/id/programmers/advanced-features/advanced-features-prefilters.xml + docs/id/programmers/advanced-features/section-template-cache-handler-func.xml + docs/id/programmers/advanced-features/template-resources.xml + docs/id/programmers/api-functions/api-append-by-ref.xml + docs/id/programmers/api-functions/api-append.xml + docs/id/programmers/api-functions/api-assign-by-ref.xml + docs/id/programmers/api-functions/api-assign.xml + docs/id/programmers/api-functions/api-clear-all-assign.xml + docs/id/programmers/api-functions/api-clear-all-cache.xml + docs/id/programmers/api-functions/api-clear-assign.xml + docs/id/programmers/api-functions/api-clear-cache.xml + docs/id/programmers/api-functions/api-clear-compiled-tpl.xml + docs/id/programmers/api-functions/api-clear-config.xml + docs/id/programmers/api-functions/api-config-load.xml + docs/id/programmers/api-functions/api-display.xml + docs/id/programmers/api-functions/api-fetch.xml + docs/id/programmers/api-functions/api-get-config-vars.xml + docs/id/programmers/api-functions/api-get-registered-object.xml + docs/id/programmers/api-functions/api-get-template-vars.xml + docs/id/programmers/api-functions/api-is-cached.xml + docs/id/programmers/api-functions/api-load-filter.xml + docs/id/programmers/api-functions/api-register-block.xml + docs/id/programmers/api-functions/api-register-compiler-function.xml + docs/id/programmers/api-functions/api-register-function.xml + docs/id/programmers/api-functions/api-register-modifier.xml + docs/id/programmers/api-functions/api-register-object.xml + docs/id/programmers/api-functions/api-register-outputfilter.xml + docs/id/programmers/api-functions/api-register-postfilter.xml + docs/id/programmers/api-functions/api-register-prefilter.xml + docs/id/programmers/api-functions/api-register-resource.xml + docs/id/programmers/api-functions/api-template-exists.xml + docs/id/programmers/api-functions/api-trigger-error.xml + docs/id/programmers/api-functions/api-unregister-block.xml + docs/id/programmers/api-functions/api-unregister-compiler-function.xml + docs/id/programmers/api-functions/api-unregister-function.xml + docs/id/programmers/api-functions/api-unregister-modifier.xml + docs/id/programmers/api-functions/api-unregister-object.xml + docs/id/programmers/api-functions/api-unregister-outputfilter.xml + docs/id/programmers/api-functions/api-unregister-postfilter.xml + docs/id/programmers/api-functions/api-unregister-prefilter.xml + docs/id/programmers/api-functions/api-unregister-resource.xml + docs/id/programmers/api-variables/variable-autoload-filters.xml + docs/id/programmers/api-variables/variable-cache-dir.xml + docs/id/programmers/api-variables/variable-cache-handler-func.xml + docs/id/programmers/api-variables/variable-cache-lifetime.xml + docs/id/programmers/api-variables/variable-cache-modified-check.xml + docs/id/programmers/api-variables/variable-caching.xml + docs/id/programmers/api-variables/variable-compile-check.xml + docs/id/programmers/api-variables/variable-compile-dir.xml + docs/id/programmers/api-variables/variable-compile-id.xml + docs/id/programmers/api-variables/variable-compiler-class.xml + docs/id/programmers/api-variables/variable-config-booleanize.xml + docs/id/programmers/api-variables/variable-config-dir.xml + docs/id/programmers/api-variables/variable-config-fix-newlines.xml + docs/id/programmers/api-variables/variable-config-overwrite.xml + docs/id/programmers/api-variables/variable-config-read-hidden.xml + docs/id/programmers/api-variables/variable-debug-tpl.xml + docs/id/programmers/api-variables/variable-debugging-ctrl.xml + docs/id/programmers/api-variables/variable-debugging.xml + docs/id/programmers/api-variables/variable-default-modifiers.xml + docs/id/programmers/api-variables/variable-default-resource-type.xml + docs/id/programmers/api-variables/variable-default-template-handler-func.xml + docs/id/programmers/api-variables/variable-error-reporting.xml + docs/id/programmers/api-variables/variable-force-compile.xml + docs/id/programmers/api-variables/variable-left-delimiter.xml + docs/id/programmers/api-variables/variable-php-handling.xml + docs/id/programmers/api-variables/variable-plugins-dir.xml + docs/id/programmers/api-variables/variable-request-use-auto-globals.xml + docs/id/programmers/api-variables/variable-request-vars-order.xml + docs/id/programmers/api-variables/variable-right-delimiter.xml + docs/id/programmers/api-variables/variable-secure-dir.xml + docs/id/programmers/api-variables/variable-security-settings.xml + docs/id/programmers/api-variables/variable-security.xml + docs/id/programmers/api-variables/variable-template-dir.xml + docs/id/programmers/api-variables/variable-trusted-dir.xml + docs/id/programmers/api-variables/variable-use-sub-dirs.xml + docs/id/programmers/caching/caching-cacheable.xml + docs/id/programmers/caching/caching-groups.xml + docs/id/programmers/caching/caching-multiple-caches.xml + docs/id/programmers/caching/caching-setting-up.xml + docs/id/programmers/plugins/plugins-block-functions.xml + docs/id/programmers/plugins/plugins-compiler-functions.xml + docs/id/programmers/plugins/plugins-functions.xml + docs/id/programmers/plugins/plugins-howto.xml + docs/id/programmers/plugins/plugins-inserts.xml + docs/id/programmers/plugins/plugins-modifiers.xml + docs/id/programmers/plugins/plugins-naming-conventions.xml + docs/id/programmers/plugins/plugins-outputfilters.xml + docs/id/programmers/plugins/plugins-prefilters-postfilters.xml + docs/id/programmers/plugins/plugins-resources.xml + docs/id/programmers/plugins/plugins-writing.xml: + Typos correction and all translated now. + +2007-09-17 Messju Mohr + + * docs/id/bookinfo.xml + docs/id/getting-started.xml + docs/id/language-defs.ent + docs/id/language-snippets.ent + docs/id/livedocs.ent + docs/id/preface.xml: + added indonesian docs - thanks Zaenal Mutaqin + + * docs/scripts/generate_web.php: + raise pcre.backtrack_limit - thanks to takagi + +2007-09-16 Monte Ohrt + + * libs/Smarty_Compiler.class.php: + fix typo + +2007-08-22 George Miroshnikov + + * docs/ru/getting-started.xml + docs/ru/getting-started.xml: + Sync with EN. + +2007-08-01 Monte Ohrt + + * NEWS + libs/Smarty_Compiler.class.php: + add append feature to capture + +2007-06-24 TAKAGI Masahiro + + * docs/ja/getting-started.xml: + sync with en. + +2007-06-24 Messju Mohr + + * docs/Makefile.in: + reverted accidently modified file + + * docs/Makefile.in + docs/de/getting-started.xml: + sync with en + + * docs/en/getting-started.xml: + fixed link to ini_set(). thanks to Lee Yunyoung. + +2007-06-18 TAKAGI Masahiro + + * docs/ja/language-snippets.ent + docs/ja/programmers/api-functions/api-register-outputfilter.xml + docs/ja/programmers/api-functions/api-register-postfilter.xml + docs/ja/programmers/api-functions/api-register-prefilter.xml: + sync with en. + +2007-06-18 Danilo Buerger + + * docs/en/language-snippets.ent + docs/en/programmers/api-functions/api-register-outputfilter.xml + docs/en/programmers/api-functions/api-register-postfilter.xml + docs/en/programmers/api-functions/api-register-prefilter.xml: + Updated docs according to the changes from the previous commit + + * NEWS + libs/Smarty.class.php: + Added the ability to (un)register multiple filters of the same type with + the same method name but different class name. Before it was not possible + due to the fact that only the method name was used to distinguish between + different filters of the same type. This does however not allow (same as + before) to register multiple filters of the same type with the same method + and class name (i.e. different instances of the same class). + +2007-05-29 Messju Mohr + + * libs/plugins/compiler.assign.php: + fixed typo + +2007-05-11 Messju Mohr + + * NEWS + libs/Smarty_Compiler.class.php: + fixed calling registered objects' methods with an empty argument list. + thanks marcello + +2007-05-03 TAKAGI Masahiro + + * docs/ja/designers/language-variables.xml + docs/ja/designers/language-builtin-functions/language-function-config-load.xml + docs/ja/designers/language-builtin-functions/language-function-foreach.xml + docs/ja/designers/language-builtin-functions/language-function-if.xml + docs/ja/designers/language-modifiers/language-modifier-cat.xml + docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml + docs/ja/designers/language-variables/language-variables-smarty.xml: + sync with en. + +2007-05-03 Monte Ohrt + + * docs/en/designers/language-variables.xml + docs/en/designers/language-builtin-functions/language-function-config-load.xml + docs/en/designers/language-builtin-functions/language-function-foreach.xml + docs/en/designers/language-builtin-functions/language-function-if.xml + docs/en/designers/language-modifiers/language-modifier-cat.xml + docs/en/designers/language-modifiers/language-modifier-wordwrap.xml + docs/en/designers/language-variables/language-variables-smarty.xml: + update documentation corrections from marcello in the forums. Thanks + marcello! + +2007-04-22 TAKAGI Masahiro + + * docs/ja/programmers/advanced-features.xml + docs/ja/programmers/api-functions.xml + docs/ja/programmers/api-variables.xml: + corrected the garbled text. + +2007-04-21 TAKAGI Masahiro + + * docs/ja/bookinfo.xml + docs/ja/getting-started.xml + docs/ja/language-defs.ent + docs/ja/language-snippets.ent + docs/ja/livedocs.ent + docs/ja/make_chm_index.html + docs/ja/preface.xml + docs/ja/translation.xml + docs/ja/appendixes/bugs.xml + docs/ja/appendixes/resources.xml + docs/ja/appendixes/tips.xml + docs/ja/appendixes/troubleshooting.xml + docs/ja/designers/chapter-debugging-console.xml + docs/ja/designers/config-files.xml + docs/ja/designers/language-basic-syntax.xml + docs/ja/designers/language-builtin-functions.xml + docs/ja/designers/language-combining-modifiers.xml + docs/ja/designers/language-custom-functions.xml + docs/ja/designers/language-modifiers.xml + docs/ja/designers/language-variables.xml + docs/ja/designers/language-basic-syntax/language-escaping.xml + docs/ja/designers/language-basic-syntax/language-math.xml + docs/ja/designers/language-basic-syntax/language-syntax-attributes.xml + docs/ja/designers/language-basic-syntax/language-syntax-comments.xml + docs/ja/designers/language-basic-syntax/language-syntax-functions.xml + docs/ja/designers/language-basic-syntax/language-syntax-quotes.xml + docs/ja/designers/language-basic-syntax/language-syntax-variables.xml + docs/ja/designers/language-builtin-functions/language-function-capture.xml + docs/ja/designers/language-builtin-functions/language-function-config-load.xml + docs/ja/designers/language-builtin-functions/language-function-foreach.xml + docs/ja/designers/language-builtin-functions/language-function-if.xml + docs/ja/designers/language-builtin-functions/language-function-include-php.xml + docs/ja/designers/language-builtin-functions/language-function-include.xml + docs/ja/designers/language-builtin-functions/language-function-insert.xml + docs/ja/designers/language-builtin-functions/language-function-ldelim.xml + docs/ja/designers/language-builtin-functions/language-function-literal.xml + docs/ja/designers/language-builtin-functions/language-function-php.xml + docs/ja/designers/language-builtin-functions/language-function-section.xml + docs/ja/designers/language-builtin-functions/language-function-strip.xml + docs/ja/designers/language-custom-functions/language-function-assign.xml + docs/ja/designers/language-custom-functions/language-function-counter.xml + docs/ja/designers/language-custom-functions/language-function-cycle.xml + docs/ja/designers/language-custom-functions/language-function-debug.xml + docs/ja/designers/language-custom-functions/language-function-eval.xml + docs/ja/designers/language-custom-functions/language-function-fetch.xml + docs/ja/designers/language-custom-functions/language-function-html-checkboxes.xml + docs/ja/designers/language-custom-functions/language-function-html-image.xml + docs/ja/designers/language-custom-functions/language-function-html-options.xml + docs/ja/designers/language-custom-functions/language-function-html-radios.xml + docs/ja/designers/language-custom-functions/language-function-html-select-date.xml + docs/ja/designers/language-custom-functions/language-function-html-select-time.xml + docs/ja/designers/language-custom-functions/language-function-html-table.xml + docs/ja/designers/language-custom-functions/language-function-mailto.xml + docs/ja/designers/language-custom-functions/language-function-math.xml + docs/ja/designers/language-custom-functions/language-function-popup-init.xml + docs/ja/designers/language-custom-functions/language-function-popup.xml + docs/ja/designers/language-custom-functions/language-function-textformat.xml + docs/ja/designers/language-modifiers/language-modifier-capitalize.xml + docs/ja/designers/language-modifiers/language-modifier-cat.xml + docs/ja/designers/language-modifiers/language-modifier-count-characters.xml + docs/ja/designers/language-modifiers/language-modifier-count-paragraphs.xml + docs/ja/designers/language-modifiers/language-modifier-count-sentences.xml + docs/ja/designers/language-modifiers/language-modifier-count-words.xml + docs/ja/designers/language-modifiers/language-modifier-date-format.xml + docs/ja/designers/language-modifiers/language-modifier-default.xml + docs/ja/designers/language-modifiers/language-modifier-escape.xml + docs/ja/designers/language-modifiers/language-modifier-indent.xml + docs/ja/designers/language-modifiers/language-modifier-lower.xml + docs/ja/designers/language-modifiers/language-modifier-nl2br.xml + docs/ja/designers/language-modifiers/language-modifier-regex-replace.xml + docs/ja/designers/language-modifiers/language-modifier-replace.xml + docs/ja/designers/language-modifiers/language-modifier-spacify.xml + docs/ja/designers/language-modifiers/language-modifier-string-format.xml + docs/ja/designers/language-modifiers/language-modifier-strip-tags.xml + docs/ja/designers/language-modifiers/language-modifier-strip.xml + docs/ja/designers/language-modifiers/language-modifier-truncate.xml + docs/ja/designers/language-modifiers/language-modifier-upper.xml + docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml + docs/ja/designers/language-variables/language-assigned-variables.xml + docs/ja/designers/language-variables/language-config-variables.xml + docs/ja/designers/language-variables/language-variables-smarty.xml + docs/ja/programmers/advanced-features.xml + docs/ja/programmers/api-functions.xml + docs/ja/programmers/api-variables.xml + docs/ja/programmers/caching.xml + docs/ja/programmers/plugins.xml + docs/ja/programmers/smarty-constants.xml + docs/ja/programmers/advanced-features/advanced-features-objects.xml + docs/ja/programmers/advanced-features/advanced-features-outputfilters.xml + docs/ja/programmers/advanced-features/advanced-features-postfilters.xml + docs/ja/programmers/advanced-features/advanced-features-prefilters.xml + docs/ja/programmers/advanced-features/section-template-cache-handler-func.xml + docs/ja/programmers/advanced-features/template-resources.xml + docs/ja/programmers/api-functions/api-append-by-ref.xml + docs/ja/programmers/api-functions/api-append.xml + docs/ja/programmers/api-functions/api-assign-by-ref.xml + docs/ja/programmers/api-functions/api-assign.xml + docs/ja/programmers/api-functions/api-clear-all-assign.xml + docs/ja/programmers/api-functions/api-clear-all-cache.xml + docs/ja/programmers/api-functions/api-clear-assign.xml + docs/ja/programmers/api-functions/api-clear-cache.xml + docs/ja/programmers/api-functions/api-clear-compiled-tpl.xml + docs/ja/programmers/api-functions/api-clear-config.xml + docs/ja/programmers/api-functions/api-config-load.xml + docs/ja/programmers/api-functions/api-display.xml + docs/ja/programmers/api-functions/api-fetch.xml + docs/ja/programmers/api-functions/api-get-config-vars.xml + docs/ja/programmers/api-functions/api-get-registered-object.xml + docs/ja/programmers/api-functions/api-get-template-vars.xml + docs/ja/programmers/api-functions/api-is-cached.xml + docs/ja/programmers/api-functions/api-load-filter.xml + docs/ja/programmers/api-functions/api-register-block.xml + docs/ja/programmers/api-functions/api-register-compiler-function.xml + docs/ja/programmers/api-functions/api-register-function.xml + docs/ja/programmers/api-functions/api-register-modifier.xml + docs/ja/programmers/api-functions/api-register-object.xml + docs/ja/programmers/api-functions/api-register-outputfilter.xml + docs/ja/programmers/api-functions/api-register-postfilter.xml + docs/ja/programmers/api-functions/api-register-prefilter.xml + docs/ja/programmers/api-functions/api-register-resource.xml + docs/ja/programmers/api-functions/api-template-exists.xml + docs/ja/programmers/api-functions/api-trigger-error.xml + docs/ja/programmers/api-functions/api-unregister-block.xml + docs/ja/programmers/api-functions/api-unregister-compiler-function.xml + docs/ja/programmers/api-functions/api-unregister-function.xml + docs/ja/programmers/api-functions/api-unregister-modifier.xml + docs/ja/programmers/api-functions/api-unregister-object.xml + docs/ja/programmers/api-functions/api-unregister-outputfilter.xml + docs/ja/programmers/api-functions/api-unregister-postfilter.xml + docs/ja/programmers/api-functions/api-unregister-prefilter.xml + docs/ja/programmers/api-functions/api-unregister-resource.xml + docs/ja/programmers/api-variables/variable-autoload-filters.xml + docs/ja/programmers/api-variables/variable-cache-dir.xml + docs/ja/programmers/api-variables/variable-cache-handler-func.xml + docs/ja/programmers/api-variables/variable-cache-lifetime.xml + docs/ja/programmers/api-variables/variable-cache-modified-check.xml + docs/ja/programmers/api-variables/variable-caching.xml + docs/ja/programmers/api-variables/variable-compile-check.xml + docs/ja/programmers/api-variables/variable-compile-dir.xml + docs/ja/programmers/api-variables/variable-compile-id.xml + docs/ja/programmers/api-variables/variable-compiler-class.xml + docs/ja/programmers/api-variables/variable-config-booleanize.xml + docs/ja/programmers/api-variables/variable-config-dir.xml + docs/ja/programmers/api-variables/variable-config-fix-newlines.xml + docs/ja/programmers/api-variables/variable-config-overwrite.xml + docs/ja/programmers/api-variables/variable-config-read-hidden.xml + docs/ja/programmers/api-variables/variable-debug-tpl.xml + docs/ja/programmers/api-variables/variable-debugging-ctrl.xml + docs/ja/programmers/api-variables/variable-debugging.xml + docs/ja/programmers/api-variables/variable-default-modifiers.xml + docs/ja/programmers/api-variables/variable-default-resource-type.xml + docs/ja/programmers/api-variables/variable-default-template-handler-func.xml + docs/ja/programmers/api-variables/variable-error-reporting.xml + docs/ja/programmers/api-variables/variable-force-compile.xml + docs/ja/programmers/api-variables/variable-left-delimiter.xml + docs/ja/programmers/api-variables/variable-php-handling.xml + docs/ja/programmers/api-variables/variable-plugins-dir.xml + docs/ja/programmers/api-variables/variable-request-use-auto-globals.xml + docs/ja/programmers/api-variables/variable-request-vars-order.xml + docs/ja/programmers/api-variables/variable-right-delimiter.xml + docs/ja/programmers/api-variables/variable-secure-dir.xml + docs/ja/programmers/api-variables/variable-security-settings.xml + docs/ja/programmers/api-variables/variable-security.xml + docs/ja/programmers/api-variables/variable-template-dir.xml + docs/ja/programmers/api-variables/variable-trusted-dir.xml + docs/ja/programmers/api-variables/variable-use-sub-dirs.xml + docs/ja/programmers/caching/caching-cacheable.xml + docs/ja/programmers/caching/caching-groups.xml + docs/ja/programmers/caching/caching-multiple-caches.xml + docs/ja/programmers/caching/caching-setting-up.xml + docs/ja/programmers/plugins/plugins-block-functions.xml + docs/ja/programmers/plugins/plugins-compiler-functions.xml + docs/ja/programmers/plugins/plugins-functions.xml + docs/ja/programmers/plugins/plugins-howto.xml + docs/ja/programmers/plugins/plugins-inserts.xml + docs/ja/programmers/plugins/plugins-modifiers.xml + docs/ja/programmers/plugins/plugins-naming-conventions.xml + docs/ja/programmers/plugins/plugins-outputfilters.xml + docs/ja/programmers/plugins/plugins-prefilters-postfilters.xml + docs/ja/programmers/plugins/plugins-resources.xml + docs/ja/programmers/plugins/plugins-writing.xml: + added Japanese translation files. + + * docs/Makefile.in + docs/configure.in: + added the configuration for Japanese translation. + +2007-04-11 Messju Mohr + + * docs/en/programmers/smarty-constants.xml: + fixed typo + +2007-04-04 Messju Mohr + + * docs/ru/getting-started.xml: + fixed uri for Zend Accelerator + +2007-04-03 Messju Mohr + + * docs/de/getting-started.xml + docs/es/getting-started.xml + docs/it/getting-started.xml + docs/pt_BR/getting-started.xml: + fixed uris for php-accelerator + +2007-03-08 Monte Ohrt + + * libs/Config_File.class.php + libs/Smarty.class.php + libs/Smarty_Compiler.class.php: + update version numbers + +2007-03-07 Monte Ohrt + + * (Smarty_2_6_18) + NEWS: + update NEWS file with patch + + * (Smarty_2_6_18) + docs/en/designers/language-builtin-functions/language-function-section.xml: + note the fact that section loop will accept an integer + 2007-03-06 Monte Ohrt * NEWS @@ -4738,7 +5250,7 @@ * libs/Smarty.class.php libs/Smarty_Compiler.class.php: - added CVS $Id: ChangeLog,v 1.459 2007/03/07 01:31:23 changelog Exp $ + added CVS $Id: ChangeLog 2746 2007-09-28 01:32:05Z changelog $ 2003-03-31 Messju Mohr diff --git a/bundled-libs/Smarty/NEWS b/bundled-libs/Smarty/NEWS index 7364ac9..fa550ff 100644 --- a/bundled-libs/Smarty/NEWS +++ b/bundled-libs/Smarty/NEWS @@ -1,3 +1,14 @@ +Version 2.6.19 (Feb 11th, 2008) +------------------------------- + +- fix regex_replace allowing \0 in the search string (c960657, + monte) +- add append feature to {capture} (jablko, monte) +- fix when (un)registering filters with the same method name but different class + name (danilo) +- fix calling registered objects' methods with an empty argument list + (marcello, messju) + Version 2.6.18 (Mar 7th, 2007) ------------------------------ diff --git a/bundled-libs/Smarty/README b/bundled-libs/Smarty/README index 10ff6ea..6e7c93c 100644 --- a/bundled-libs/Smarty/README +++ b/bundled-libs/Smarty/README @@ -2,30 +2,35 @@ NAME: Smarty - the PHP compiling template engine -VERSION: 2.6.0 +VERSION: 2.6.19 AUTHORS: - Monte Ohrt + Monte Ohrt Andrei Zmievski MAILING LISTS: - We have a few mailing lists. "general" for you to share your ideas or ask - questions, "dev" for those interested in the development efforts of Smarty, - and "cvs" for those that would like to track the updates made in the cvs + We have a few mailing lists. "discussion" for you to share your ideas or ask + questions, "developers" for those interested in the development efforts of Smarty, + and "svn" for those that would like to track the updates made in the svn repository. send a blank e-mail message to: - smarty-general-subscribe@lists.php.net (subscribe to the general list) - smarty-general-unsubscribe@lists.php.net (unsubscribe from the general list) - smarty-general-digest-subscribe@lists.php.net (subscribe to digest) - smarty-general-digest-unsubscribe@lists.php.net (unsubscribe from digest) - smarty-dev-subscribe@lists.php.net (subscribe to the dev list) - smarty-dev-unsubscribe@lists.php.net (unsubscribe from the dev list) - smarty-cvs-subscribe@lists.php.net (subscribe to the cvs list) - smarty-cvs-unsubscribe@lists.php.net (unsubscribe from the cvs list) + smarty-discussion-subscribe@googlecode.com(subscribe to the general discussion list) + smarty-discussion-unsubscribe@googlecode.com (unsubscribe from the general discussion list) + smarty-discussion-digest-subscribe@googlecode.com (subscribe to digest) + smarty-discussion-digest-unsubscribe@googlecode.com (unsubscribe from digest) + smarty-developers-subscribe@googlecode.com (subscribe to the dev list) + smarty-developers-unsubscribe@googlecode.com (unsubscribe from the dev list) + smarty-svn-subscribe@googlecode.com (subscribe to the svn list) + smarty-svn-unsubscribe@googlecode.com (unsubscribe from the svn list) + You can also browse the mailing list archives at + http://groups.google.com/group/smarty-discussion + http://groups.google.com/group/smarty-developers + + and the OLD list archives at http://marc.theaimsgroup.com/?l=smarty&r=1&w=2 SYNOPSIS: @@ -75,6 +80,6 @@ DESCRIPTION: * and many more. COPYRIGHT: - Copyright (c) 2001,2002 ispi of Lincoln, Inc. All rights reserved. + Copyright (c) 2001-2005 New Digital Group, Inc. All rights reserved. This software is released under the GNU Lesser General Public License. Please read the disclaimer at the top of the Smarty.class.php file. diff --git a/bundled-libs/Smarty/libs/Config_File.class.php b/bundled-libs/Smarty/libs/Config_File.class.php index 3d7c1b4..e3c3ca2 100644 --- a/bundled-libs/Smarty/libs/Config_File.class.php +++ b/bundled-libs/Smarty/libs/Config_File.class.php @@ -18,14 +18,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @link http://smarty.php.net/ - * @version 2.6.18 + * @version 2.6.19 * @copyright Copyright: 2001-2005 New Digital Group, Inc. * @author Andrei Zmievski * @access public * @package Smarty */ -/* $Id: Config_File.class.php,v 1.88 2007/03/06 10:40:06 messju Exp $ */ +/* $Id: Config_File.class.php 2702 2007-03-08 19:11:22Z mohrt $ */ /** * Config file reading class diff --git a/bundled-libs/Smarty/libs/Smarty.class.php b/bundled-libs/Smarty/libs/Smarty.class.php index f05e0da..5eda787 100644 --- a/bundled-libs/Smarty/libs/Smarty.class.php +++ b/bundled-libs/Smarty/libs/Smarty.class.php @@ -27,10 +27,10 @@ * @author Monte Ohrt * @author Andrei Zmievski * @package Smarty - * @version 2.6.18 + * @version 2.6.19 */ -/* $Id: Smarty.class.php,v 1.528 2007/03/06 10:40:06 messju Exp $ */ +/* $Id: Smarty.class.php 2722 2007-06-18 14:29:00Z danilo $ */ /** * DIR_SEP isn't used anymore, but third party apps might @@ -464,7 +464,7 @@ class Smarty * * @var string */ - var $_version = '2.6.18'; + var $_version = '2.6.19'; /** * current template inclusion depth @@ -838,69 +838,66 @@ class Smarty * Registers a prefilter function to apply * to a template before compiling * - * @param string $function name of PHP function to register + * @param callback $function */ function register_prefilter($function) { - $_name = (is_array($function)) ? $function[1] : $function; - $this->_plugins['prefilter'][$_name] + $this->_plugins['prefilter'][$this->_get_filter_name($function)] = array($function, null, null, false); } /** * Unregisters a prefilter function * - * @param string $function name of PHP function + * @param callback $function */ function unregister_prefilter($function) { - unset($this->_plugins['prefilter'][$function]); + unset($this->_plugins['prefilter'][$this->_get_filter_name($function)]); } /** * Registers a postfilter function to apply * to a compiled template after compilation * - * @param string $function name of PHP function to register + * @param callback $function */ function register_postfilter($function) { - $_name = (is_array($function)) ? $function[1] : $function; - $this->_plugins['postfilter'][$_name] + $this->_plugins['postfilter'][$this->_get_filter_name($function)] = array($function, null, null, false); } /** * Unregisters a postfilter function * - * @param string $function name of PHP function + * @param callback $function */ function unregister_postfilter($function) { - unset($this->_plugins['postfilter'][$function]); + unset($this->_plugins['postfilter'][$this->_get_filter_name($function)]); } /** * Registers an output filter function to apply * to a template output * - * @param string $function name of PHP function + * @param callback $function */ function register_outputfilter($function) { - $_name = (is_array($function)) ? $function[1] : $function; - $this->_plugins['outputfilter'][$_name] + $this->_plugins['outputfilter'][$this->_get_filter_name($function)] = array($function, null, null, false); } /** * Unregisters an outputfilter function * - * @param string $function name of PHP function + * @param callback $function */ function unregister_outputfilter($function) { - unset($this->_plugins['outputfilter'][$function]); + unset($this->_plugins['outputfilter'][$this->_get_filter_name($function)]); } /** @@ -1935,6 +1932,25 @@ class Smarty { return eval($code); } + + /** + * Extracts the filter name from the given callback + * + * @param callback $function + * @return string + */ + function _get_filter_name($function) + { + if (is_array($function)) { + $_class_name = (is_object($function[0]) ? + get_class($function[0]) : $function[0]); + return $_class_name . '_' . $function[1]; + } + else { + return $function; + } + } + /**#@-*/ } diff --git a/bundled-libs/Smarty/libs/Smarty_Compiler.class.php b/bundled-libs/Smarty/libs/Smarty_Compiler.class.php index f54cc21..52466d3 100644 --- a/bundled-libs/Smarty/libs/Smarty_Compiler.class.php +++ b/bundled-libs/Smarty/libs/Smarty_Compiler.class.php @@ -21,12 +21,12 @@ * @link http://smarty.php.net/ * @author Monte Ohrt * @author Andrei Zmievski - * @version 2.6.18 + * @version 2.6.19 * @copyright 2001-2005 New Digital Group, Inc. * @package Smarty */ -/* $Id: Smarty_Compiler.class.php,v 1.395 2007/03/06 10:40:06 messju Exp $ */ +/* $Id: Smarty_Compiler.class.php 2736 2007-09-16 14:47:53Z mohrt $ */ /** * Template compiling class @@ -869,7 +869,7 @@ class Smarty_Compiler extends Smarty { // traditional argument format $args = implode(',', array_values($attrs)); if (empty($args)) { - $args = 'null'; + $args = ''; } } @@ -1171,7 +1171,7 @@ class Smarty_Compiler extends Smarty { } $item = $this->_dequote($attrs['item']); if (!preg_match('~^\w+$~', $item)) { - return $this->_syntax_error("'foreach: 'item' must be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__); + return $this->_syntax_error("foreach: 'item' must be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__); } if (isset($attrs['key'])) { @@ -1222,23 +1222,21 @@ class Smarty_Compiler extends Smarty { $attrs = $this->_parse_attrs($tag_args); if ($start) { - if (isset($attrs['name'])) - $buffer = $attrs['name']; - else - $buffer = "'default'"; - - if (isset($attrs['assign'])) - $assign = $attrs['assign']; - else - $assign = null; + $buffer = isset($attrs['name']) ? $attrs['name'] : "'default'"; + $assign = isset($attrs['assign']) ? $attrs['assign'] : null; + $append = isset($attrs['append']) ? $attrs['append'] : null; + $output = ""; - $this->_capture_stack[] = array($buffer, $assign); + $this->_capture_stack[] = array($buffer, $assign, $append); } else { - list($buffer, $assign) = array_pop($this->_capture_stack); + list($buffer, $assign, $append) = array_pop($this->_capture_stack); $output = "_smarty_vars['capture'][$buffer] = ob_get_contents(); "; if (isset($assign)) { $output .= " \$this->assign($assign, ob_get_contents());"; } + if (isset($append)) { + $output .= " \$this->append($append, ob_get_contents());"; + } $output .= "ob_end_clean(); ?>"; } diff --git a/bundled-libs/Smarty/libs/plugins/compiler.assign.php b/bundled-libs/Smarty/libs/plugins/compiler.assign.php index 2e02017..abef377 100644 --- a/bundled-libs/Smarty/libs/plugins/compiler.assign.php +++ b/bundled-libs/Smarty/libs/plugins/compiler.assign.php @@ -13,6 +13,8 @@ * Purpose: assign a value to a template variable * @link http://smarty.php.net/manual/en/language.custom.functions.php#LANGUAGE.FUNCTION.ASSIGN {assign} * (Smarty online manual) + * @author Monte Ohrt (initial author) + * @author messju mohr (conversion to compiler function) * @param string containing var-attribute and value-attribute * @param Smarty_Compiler */ diff --git a/bundled-libs/Smarty/libs/plugins/modifier.regex_replace.php b/bundled-libs/Smarty/libs/plugins/modifier.regex_replace.php index 7eee497..d1f1545 100644 --- a/bundled-libs/Smarty/libs/plugins/modifier.regex_replace.php +++ b/bundled-libs/Smarty/libs/plugins/modifier.regex_replace.php @@ -11,9 +11,10 @@ * * Type: modifier
* Name: regex_replace
- * Purpose: regular epxression search/replace + * Purpose: regular expression search/replace * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php * regex_replace (Smarty online manual) + * @author Monte Ohrt * @param string * @param string|array * @param string|array @@ -21,10 +22,13 @@ */ function smarty_modifier_regex_replace($string, $search, $replace) { - if (preg_match('!\W(\w+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) { + if (($pos = strpos($search,"\0")) !== false) + $search = substr($search,0,$pos); + if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) { /* remove eval-modifier from $search */ - $search = substr($search, 0, -strlen($match[1])) . str_replace('e', '', $match[1]); + $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]); } + return preg_replace($search, $replace, $string); } diff --git a/docs/NEWS b/docs/NEWS index b696392..da80d26 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,6 +3,8 @@ Version 1.3 () ------------------------------------------------------------------------ + * Upgrade to Smarty 2.6.19 (garvinhicking) + * Fixed bug #1893108: Missing 'xmlns' attribute in templates for tag. (garvinhicking) -- 2.39.5