From: Chuck Hagenbuch Date: Thu, 11 Jun 2009 21:46:40 +0000 (-0400) Subject: Horde_Text:: -> Horde_Text_Filter::filter() X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e7e357838315390767991ac173b6ea81a245879e;p=horde.git Horde_Text:: -> Horde_Text_Filter::filter() --- diff --git a/chora/annotate.php b/chora/annotate.php index ab5a68911..4cacd15bb 100644 --- a/chora/annotate.php +++ b/chora/annotate.php @@ -41,7 +41,7 @@ try { Chora::fatal($e); } -$title = sprintf(_("Source Annotation of %s (revision %s)"), Horde_Text::htmlAllSpaces($where), $rev); +$title = sprintf(_("Source Annotation of %s (revision %s)"), Horde_Text_Filter::filter($where, 'space2html', array('charset' => NLS::getCharset(), 'encode' => true, 'encode_all' => true)), $rev); $extraLink = sprintf('%s | %s', Chora::url('co', $where, array('r' => $rev)), _("View"), Chora::url('co', $where, array('r' => $rev, 'p' => 1)), _("Download")); @@ -72,7 +72,7 @@ while (list(,$line) = each($lines)) { } $prev = $fl->queryPreviousRevision($rev); - $line = Horde_Text::htmlAllSpaces($line['line']); + $line = Horde_Text_Filter::filter($line['line'], 'space2html', array('charset' => NLS::getCharset(), 'encode' => true, 'encode_all' => true)); include CHORA_TEMPLATES . '/annotate/line.inc'; } diff --git a/chora/browsedir.php b/chora/browsedir.php index 8fc860bcf..9bb132a84 100644 --- a/chora/browsedir.php +++ b/chora/browsedir.php @@ -111,7 +111,7 @@ if ($fileList) { $log = $lg->queryLog(); $attic = $currFile->isDeleted(); $fileName = $where . ($attic ? '/' . 'Attic' : '') . '/' . $realname; - $name = Horde_Text::htmlAllSpaces($realname); + $name = Horde_Text_Filter::filter($realname, 'space2html', array('charset' => NLS::getCharset(), 'encode' => true, 'encode_all' => true)); $url = Chora::url('browsefile', $fileName); $readableDate = Chora::readableTime($date); if ($log) {