| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -860,13 +860,18 @@ |
| 861 | 861 | $count = 0; |
| 862 | 862 | |
| 863 | 863 | $linkList = ''; |
| 864 | | - $lines = explode( "\n", htmlspecialchars($text) ); |
| | 864 | + # Normalize space characters |
| | 865 | + $text = str_replace( array("\r","\t"), array("\n"," "), htmlspecialchars($text) ); |
| | 866 | + # Split out each line as a link |
| | 867 | + $lines = explode( "\n", $text ); |
| 865 | 868 | foreach( $lines as $line ) { |
| 866 | | - $links = explode("\n",$line); |
| | 869 | + $links = explode(" ",$line,2); |
| 867 | 870 | $link = $links[0]; |
| | 871 | + # Any explanation text is not part of the link... |
| | 872 | + $extra = isset($links[1]) ? ' '.$links[1] : ''; |
| 868 | 873 | if( strpos($link,'.') ) { |
| 869 | 874 | $link = ( strpos($link,'http://')===false ) ? 'http://'.$link : $link; |
| 870 | | - $linkList .= "<li><a href='$link'>$link</a></li>\n"; |
| | 875 | + $linkList .= "<li><a href='$link'>$link</a>$extra</li>\n"; |
| 871 | 876 | } |
| 872 | 877 | $count++; |
| 873 | 878 | if( $count >= $max ) |