diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-07 14:09:19 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-07 14:09:19 +0100 |
| commit | 7c14ade6c0d9bffbd419c20ea26bb7ff9b86f04b (patch) | |
| tree | 64607907fd7ea84c6e06819e2036570232a39bda /lib/sisu/v0/html_tune.rb | |
| parent | Merge branch 'upstream' into debian/sid (diff) | |
| parent | cleaning, and make sure in xml   rather than is used (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/html_tune.rb')
| -rw-r--r-- | lib/sisu/v0/html_tune.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/sisu/v0/html_tune.rb b/lib/sisu/v0/html_tune.rb index 0b861526..b98f19d8 100644 --- a/lib/sisu/v0/html_tune.rb +++ b/lib/sisu/v0/html_tune.rb @@ -278,7 +278,7 @@ module SiSU_Tune end word end - @words + @words=@words.join(' ') end def url_markup data=@data @@ -306,9 +306,8 @@ module SiSU_Tune end if para =~/\{.+?\}((?:https?|file|ftp)\S+|image)/ @word_mode=para.scan(/\{.+?\}(?:(?:https?|file|ftp)\S+|image)|\S+/) - word_mode=urls(@word_mode) - words=word_mode.join(' ') - para.gsub!(/.+/,words) + words=urls(@word_mode) + para.gsub!(/.+/m,words) end if (para !~/^0~|^<:code>/) para.gsub!(/\\copyright/i,%{<sup>©</sup>}) |