smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-11-03 13:51:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix wordwrap modifier could fail if used in nocache code.

Browse Source 
converted plugin file shared.mb_wordwrap.php into modifier.mb_wordwrap.php
This commit is contained in:
Uwe Tews
2017-08-05 19:59:23 +02:00
parent c3b331d2ad
commit 5cc9b27784
7 changed files with 132 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/plugins/block.textformat.php
View File

@@ -35,12 +35,15 @@
*/
function smarty_block_textformat($params, $content, $template, &$repeat)
{
static $mb_wordwrap_loaded = false;
if (is_null($content)) {
return;
}
if (!isset($template->smarty->_cache[ '_required_smw' ])) {
require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php');
$template->smarty->_cache[ '_required_smw' ] = true;
if (Smarty::$_MBSTRING && !$mb_wordwrap_loaded) {
if (!is_callable('smarty_modifier_mb_wordwrap')) {
require_once(SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php');
}
$mb_wordwrap_loaded = true;
}
$style = null;
@@ -98,7 +101,7 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
}
// wordwrap sentences
if (Smarty::$_MBSTRING) {
$_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
$_paragraph = smarty_modifier_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
} else {
$_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
}