Permalink
Browse files

New space-removal works better if done before adding link tags :-)

  • Loading branch information...
1 parent 0ab8511 commit 7b3be1b12d35e8dceea8db1015c515e72a2e7783 martin committed Aug 22, 2002
Showing with 7 additions and 7 deletions.
  1. +7 −7 lib/weblib.php
View
14 lib/weblib.php
@@ -265,6 +265,13 @@ function text_to_html($text, $smiley=true, $para=true) {
global $CFG;
+ // Remove any whitespace that may be between HTML tags
+ $text = eregi_replace(">([[:space:]]+)<", "><", $text);
+
+ // Remove any returns that precede or follow HTML tags
+ $text = eregi_replace("([\n\r])+<", " <", $text);
+ $text = eregi_replace(">([\n\r])+", "> ", $text);
+
// Make URLs into links. eg http://moodle.com/
$text = eregi_replace("([[:alnum:]]+)://([^[:space:]]*)([[:alnum:]#?/&=])",
"<A HREF=\"\\1://\\2\\3\" TARGET=\"newpage\">\\1://\\2\\3</A>", $text);
@@ -273,13 +280,6 @@ function text_to_html($text, $smiley=true, $para=true) {
$text = eregi_replace("([[:space:]])www.([^[:space:]]*)([[:alnum:]#?/&=])",
"\\1<A HREF=\"http://www.\\2\\3\" TARGET=\"newpage\">www.\\2\\3</A>", $text);
- // Remove any whitespace that may be between HTML tags
- $text = eregi_replace(">([[:space:]]+)<", "><", $text);
-
- // Remove any returns that precede or follow HTML tags
- $text = eregi_replace("([\n\r])+<", " <", $text);
- $text = eregi_replace(">([\n\r])+", "> ", $text);
-
// Make returns into HTML newlines.
$text = nl2br($text);

0 comments on commit 7b3be1b

Please sign in to comment.