From 27103697525dc8d7b6d5055c435de9fd0d10ba87 Mon Sep 17 00:00:00 2001 From: nbm Date: Sun, 19 Feb 2006 14:12:38 +0000 Subject: [PATCH] Make spaces before linebreaks less jarring. --- bin/smarty_to_gettext.php | 2 +- lib/templating/smartytemplate.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/smarty_to_gettext.php b/bin/smarty_to_gettext.php index a14a2f7..eede459 100755 --- a/bin/smarty_to_gettext.php +++ b/bin/smarty_to_gettext.php @@ -81,7 +81,7 @@ function do_file($file) $content = $matches[3][$i]; if (!preg_match('/formatmatters\s*=\s*["\']?\s*(.[^\"\']*)\s*["\']?/', $matches[2][$i], $match)) { $replace = array( - '@[\n\r]+@' => ' ', + '@ *[\n\r]+@' => ' ', ); $content = preg_replace(array_keys($replace), array_values($replace), $content); } diff --git a/lib/templating/smartytemplate.inc.php b/lib/templating/smartytemplate.inc.php index eb45b86..28c8d90 100644 --- a/lib/templating/smartytemplate.inc.php +++ b/lib/templating/smartytemplate.inc.php @@ -118,7 +118,7 @@ class KTSmartyTemplate extends KTTemplate { $oi18n = $oRegistry->geti18n($sDomain); $content = trim($content); $replace = array( - '@[\n\r]+@' => ' ', + '@ *[\n\r]+@' => ' ', ); $content = preg_replace(array_keys($replace), array_values($replace), $content); -- libgit2 0.21.4