Merge lp://qastaging/~wibblymat/ubuntu/oneiric/smarty3/update-to-3.0.8 into lp://qastaging/ubuntu/oneiric/smarty3

Proposed by Mat Scales
Status: Merged
Merged at revision: 4
Proposed branch: lp://qastaging/~wibblymat/ubuntu/oneiric/smarty3/update-to-3.0.8
Merge into: lp://qastaging/ubuntu/oneiric/smarty3
Diff against target: 23851 lines (+10868/-7750)
132 files modified
COPYING.lib (+165/-0)
README (+94/-81)
SMARTY2_BC_NOTES (+63/-37)
change_log.txt (+1457/-0)
debian/changelog (+7/-0)
debian/control (+2/-1)
demo/templates/header.tpl (+0/-1)
libs/Smarty.class.php (+472/-429)
libs/debug.tpl (+6/-9)
libs/plugins/block.php.php (+18/-18)
libs/plugins/block.textformat.php (+32/-33)
libs/plugins/function.counter.php (+8/-8)
libs/plugins/function.cycle.php (+39/-34)
libs/plugins/function.fetch.php (+6/-7)
libs/plugins/function.html_checkboxes.php (+3/-5)
libs/plugins/function.html_image.php (+39/-41)
libs/plugins/function.html_options.php (+52/-41)
libs/plugins/function.html_radios.php (+39/-41)
libs/plugins/function.html_select_date.php (+42/-45)
libs/plugins/function.html_select_time.php (+26/-29)
libs/plugins/function.html_table.php (+50/-49)
libs/plugins/function.mailto.php (+48/-49)
libs/plugins/function.math.php (+3/-4)
libs/plugins/function.popup.php (+0/-118)
libs/plugins/function.popup_init.php (+0/-41)
libs/plugins/modifier.capitalize.php (+22/-26)
libs/plugins/modifier.cat.php (+0/-31)
libs/plugins/modifier.count_characters.php (+0/-29)
libs/plugins/modifier.count_paragraphs.php (+0/-26)
libs/plugins/modifier.count_sentences.php (+0/-27)
libs/plugins/modifier.count_words.php (+0/-25)
libs/plugins/modifier.date_format.php (+24/-24)
libs/plugins/modifier.debug_print_var.php (+19/-19)
libs/plugins/modifier.default.php (+0/-29)
libs/plugins/modifier.escape.php (+24/-44)
libs/plugins/modifier.indent.php (+0/-28)
libs/plugins/modifier.lower.php (+0/-30)
libs/plugins/modifier.noprint.php (+0/-24)
libs/plugins/modifier.regex_replace.php (+3/-5)
libs/plugins/modifier.replace.php (+24/-41)
libs/plugins/modifier.spacify.php (+30/-20)
libs/plugins/modifier.string_format.php (+0/-27)
libs/plugins/modifier.strip.php (+0/-31)
libs/plugins/modifier.strip_tags.php (+0/-31)
libs/plugins/modifier.truncate.php (+49/-46)
libs/plugins/modifier.upper.php (+0/-30)
libs/plugins/modifier.wordwrap.php (+0/-29)
libs/plugins/modifiercompiler.cat.php (+29/-0)
libs/plugins/modifiercompiler.count_characters.php (+39/-0)
libs/plugins/modifiercompiler.count_paragraphs.php (+27/-0)
libs/plugins/modifiercompiler.count_sentences.php (+27/-0)
libs/plugins/modifiercompiler.count_words.php (+31/-0)
libs/plugins/modifiercompiler.default.php (+33/-0)
libs/plugins/modifiercompiler.indent.php (+32/-0)
libs/plugins/modifiercompiler.lower.php (+31/-0)
libs/plugins/modifiercompiler.noprint.php (+24/-0)
libs/plugins/modifiercompiler.string_format.php (+26/-0)
libs/plugins/modifiercompiler.strip.php (+33/-0)
libs/plugins/modifiercompiler.strip_tags.php (+34/-0)
libs/plugins/modifiercompiler.upper.php (+30/-0)
libs/plugins/modifiercompiler.wordwrap.php (+35/-0)
libs/plugins/outputfilter.trimwhitespace.php (+2/-1)
libs/plugins/shared.escape_special_chars.php (+2/-4)
libs/plugins/shared.make_timestamp.php (+11/-11)
libs/plugins/shared.mb_str_replace.php (+38/-0)
libs/plugins/variablefilter.htmlspecialchars.php (+12/-11)
libs/sysplugins/smarty_internal_cache.php (+0/-102)
libs/sysplugins/smarty_internal_cacheresource_file.php (+59/-44)
libs/sysplugins/smarty_internal_compile_append.php (+35/-46)
libs/sysplugins/smarty_internal_compile_assign.php (+43/-44)
libs/sysplugins/smarty_internal_compile_block.php (+138/-67)
libs/sysplugins/smarty_internal_compile_break.php (+65/-0)
libs/sysplugins/smarty_internal_compile_call.php (+83/-38)
libs/sysplugins/smarty_internal_compile_capture.php (+39/-30)
libs/sysplugins/smarty_internal_compile_config_load.php (+39/-28)
libs/sysplugins/smarty_internal_compile_continue.php (+64/-0)
libs/sysplugins/smarty_internal_compile_debug.php (+22/-18)
libs/sysplugins/smarty_internal_compile_eval.php (+22/-17)
libs/sysplugins/smarty_internal_compile_extends.php (+43/-63)
libs/sysplugins/smarty_internal_compile_for.php (+35/-23)
libs/sysplugins/smarty_internal_compile_foreach.php (+43/-17)
libs/sysplugins/smarty_internal_compile_function.php (+79/-45)
libs/sysplugins/smarty_internal_compile_if.php (+113/-48)
libs/sysplugins/smarty_internal_compile_include.php (+99/-58)
libs/sysplugins/smarty_internal_compile_include_php.php (+57/-35)
libs/sysplugins/smarty_internal_compile_insert.php (+71/-31)
libs/sysplugins/smarty_internal_compile_ldelim.php (+22/-17)
libs/sysplugins/smarty_internal_compile_nocache.php (+30/-26)
libs/sysplugins/smarty_internal_compile_private_block_plugin.php (+40/-34)
libs/sysplugins/smarty_internal_compile_private_function_plugin.php (+30/-25)
libs/sysplugins/smarty_internal_compile_private_modifier.php (+55/-45)
libs/sysplugins/smarty_internal_compile_private_object_block_function.php (+50/-30)
libs/sysplugins/smarty_internal_compile_private_object_function.php (+17/-8)
libs/sysplugins/smarty_internal_compile_private_print_expression.php (+58/-42)
libs/sysplugins/smarty_internal_compile_private_registered_block.php (+48/-32)
libs/sysplugins/smarty_internal_compile_private_registered_function.php (+19/-11)
libs/sysplugins/smarty_internal_compile_private_special_variable.php (+28/-29)
libs/sysplugins/smarty_internal_compile_rdelim.php (+23/-18)
libs/sysplugins/smarty_internal_compile_section.php (+41/-38)
libs/sysplugins/smarty_internal_compile_while.php (+28/-12)
libs/sysplugins/smarty_internal_compilebase.php (+101/-54)
libs/sysplugins/smarty_internal_config.php (+47/-27)
libs/sysplugins/smarty_internal_config_file_compiler.php (+3/-2)
libs/sysplugins/smarty_internal_configfilelexer.php (+22/-22)
libs/sysplugins/smarty_internal_configfileparser.php (+45/-39)
libs/sysplugins/smarty_internal_data.php (+279/-243)
libs/sysplugins/smarty_internal_debug.php (+157/-117)
libs/sysplugins/smarty_internal_filter.php (+89/-0)
libs/sysplugins/smarty_internal_filter_handler.php (+13/-13)
libs/sysplugins/smarty_internal_function_call_handler.php (+33/-40)
libs/sysplugins/smarty_internal_get_include_path.php (+44/-0)
libs/sysplugins/smarty_internal_nocache_insert.php (+49/-0)
libs/sysplugins/smarty_internal_parsetree.php (+124/-9)
libs/sysplugins/smarty_internal_register.php (+131/-222)
libs/sysplugins/smarty_internal_resource_eval.php (+89/-0)
libs/sysplugins/smarty_internal_resource_extends.php (+27/-61)
libs/sysplugins/smarty_internal_resource_file.php (+41/-40)
libs/sysplugins/smarty_internal_resource_php.php (+46/-46)
libs/sysplugins/smarty_internal_resource_registered.php (+57/-51)
libs/sysplugins/smarty_internal_resource_stream.php (+31/-29)
libs/sysplugins/smarty_internal_resource_string.php (+89/-46)
libs/sysplugins/smarty_internal_security_handler.php (+0/-146)
libs/sysplugins/smarty_internal_smartytemplatecompiler.php (+2/-0)
libs/sysplugins/smarty_internal_template.php (+451/-325)
libs/sysplugins/smarty_internal_templatecompilerbase.php (+189/-172)
libs/sysplugins/smarty_internal_templatelexer.php (+374/-220)
libs/sysplugins/smarty_internal_templateparser.php (+2999/-2604)
libs/sysplugins/smarty_internal_unregister.php (+0/-151)
libs/sysplugins/smarty_internal_utility.php (+37/-24)
libs/sysplugins/smarty_internal_wrapper.php (+79/-75)
libs/sysplugins/smarty_internal_write_file.php (+26/-19)
libs/sysplugins/smarty_security.php (+194/-62)
To merge this branch: bzr merge lp://qastaging/~wibblymat/ubuntu/oneiric/smarty3/update-to-3.0.8
Reviewer Review Type Date Requested Status
Micah Gersten (community) Approve
Ubuntu branches Pending
Review via email: mp+65862@code.qastaging.launchpad.net

Description of the change

Updated smarty3 to the latest upstream version (http://www.smarty.net/files/Smarty-3.0.8.tar.gz)

To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Taking a look

Revision history for this message
Micah Gersten (micahg) wrote :

Thank you for working on this update, I am approving with the following modifications which I made:
1. Version should be 3.0.8-0ubuntu1 instead of 3.0.8-1 (uupdate should do this for you)
2. No need to mention update-maintainer in the changelog (I can't find the policy reference at the moment for that)
3. Added a space in the bug closing string (was: LP:#801924, now LP: #801924)

Feel free to drop by #ubuntu-motu on freenode if you have any questions

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: