Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Plugin / smiley.pm

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 7a9026025ed94f778aa4b6e666677b27595f605b..2633b1ea14cf6ab247ea858e3049c977db5f54bc 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -92,10 +92,6 @@ MATCH:       while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
                                         $smileys{$smiley}, linktext => $smiley);
                        pos=$epos+1;
                }
                                         $smileys{$smiley}, linktext => $smiley);
                        pos=$epos+1;
                }

-
-               # Breaks out at end, otherwise it will scan through again,
-               # replacing de-escaped ones.
-               #last unless defined pos;

        }
 
        return $_;
        }
 
        return $_;