diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-10-07 10:00:53 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-10-07 10:00:53 -0400 |
| commit | 42d7710823483e419854e143561e543144871650 (patch) | |
| tree | c16d5408dc04df8f2eb6a8114a14eefdbe8a850e /lib/sisu/v2/dal_images.rb | |
| parent | debian/changelog 2.7.2-1 (diff) | |
| parent | sisu_markup.sst, document a fix (v1 & 2) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/dal_images.rb')
| -rw-r--r-- | lib/sisu/v2/dal_images.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sisu/v2/dal_images.rb b/lib/sisu/v2/dal_images.rb index 0b6d2b1e..ed537f22 100644 --- a/lib/sisu/v2/dal_images.rb +++ b/lib/sisu/v2/dal_images.rb @@ -83,7 +83,7 @@ module SiSU_images unless dob.is =~/^table/ dob.obj.strip! if dob.obj =~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)(?:\s*|\s+.+)?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image)/ - if dob.obj !~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)\s+\d+x\d+\s+/ + if dob.obj !~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)\s+\d+x\d+/ m=/#{Mx[:lnk_o]}\s*(\S+\.(?:png|jpg|gif))/ if imagemagick_ imgs=dob.obj.scan(m).flatten |