From 6dc7cafe006f29c5dc852d624320d6b0ff9e4498 Mon Sep 17 00:00:00 2001
From: Jens Maier <jens@elberet.de>
Date: Thu, 23 Apr 2015 12:03:21 +0200
Subject: [PATCH] phpBB importer: fix greedy smiley regex

---
 script/import_scripts/phpbb3.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/import_scripts/phpbb3.rb b/script/import_scripts/phpbb3.rb
index 10a0f3c401d..373db6e755b 100644
--- a/script/import_scripts/phpbb3.rb
+++ b/script/import_scripts/phpbb3.rb
@@ -274,7 +274,7 @@ class ImportScripts::PhpBB3 < ImportScripts::Base
     s = raw.dup
 
     # :) is encoded as <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) -->
-    s.gsub!(/<!-- s(\S+) -->(?:.*)<!-- s(?:\S+) -->/, '\1')
+    s.gsub!(/<!-- s(\S+) --><img (?:[^>]+) \/><!-- s(?:\S+) -->/, '\1')
 
     # Internal forum links of this form: <!-- l --><a class="postlink-local" href="https://example.com/forums/viewtopic.php?f=26&amp;t=3412">viewtopic.php?f=26&amp;t=3412</a><!-- l -->
     s.gsub!(/<!-- l --><a(?:.+)href="(?:\S+)"(?:.*)>viewtopic(?:.*)t=(\d+)<\/a><!-- l -->/) do |phpbb_link|