Peter M. Groen / knowledgetree

Commit 27103697525dc8d7b6d5055c435de9fd0d10ba87

Authored by nbm
1 parent f986d488

Make spaces before linebreaks less jarring. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4963 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
bin/smarty_to_gettext.php
  View file @2710369
@@ -81,7 +81,7 @@ function do_file($file) @@ -81,7 +81,7 @@ function do_file($file)
81 $content = $matches[3][$i]; 81 $content = $matches[3][$i];
82 if (!preg_match('/formatmatters\s*=\s*["\']?\s*(.[^\"\']*)\s*["\']?/', $matches[2][$i], $match)) { 82 if (!preg_match('/formatmatters\s*=\s*["\']?\s*(.[^\"\']*)\s*["\']?/', $matches[2][$i], $match)) {
83 $replace = array( 83 $replace = array(
84 - '@[\n\r]+@' => ' ', 84 + '@ *[\n\r]+@' => ' ',
85 ); 85 );
86 $content = preg_replace(array_keys($replace), array_values($replace), $content); 86 $content = preg_replace(array_keys($replace), array_values($replace), $content);
87 } 87 }
lib/templating/smartytemplate.inc.php
  View file @2710369
@@ -118,7 +118,7 @@ class KTSmartyTemplate extends KTTemplate { @@ -118,7 +118,7 @@ class KTSmartyTemplate extends KTTemplate {
118 $oi18n = $oRegistry->geti18n($sDomain); 118 $oi18n = $oRegistry->geti18n($sDomain);
119 $content = trim($content); 119 $content = trim($content);
120 $replace = array( 120 $replace = array(
121 - '@[\n\r]+@' => ' ', 121 + '@ *[\n\r]+@' => ' ',
122 ); 122 );
123 $content = preg_replace(array_keys($replace), array_values($replace), $content); 123 $content = preg_replace(array_keys($replace), array_values($replace), $content);
124 124