summaryrefslogtreecommitdiff
path: root/inc/parser/parser.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2008-10-11 20:47:17 +0200
committerAndreas Gohr <andi@splitbrain.org>2008-10-11 20:47:17 +0200
commit92655603877e0743516b2218cf67cb011afcc7b5 (patch)
treec80f2f1ff0f195161b6c99ab54dbd1f3b0841fae /inc/parser/parser.php
parente8f8d645be4a431ee7114859b9aedae042f52ead (diff)
downloadrpg-92655603877e0743516b2218cf67cb011afcc7b5.tar.gz
rpg-92655603877e0743516b2218cf67cb011afcc7b5.tar.bz2
recognize smileys with proper boundaries only FS#1489
darcs-hash:20081011184717-7ad00-0f910f4d061e00ccfdf722a3f971656da1b7979b.gz
Diffstat (limited to 'inc/parser/parser.php')
-rw-r--r--inc/parser/parser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 37da712cc..58c0c4623 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -652,7 +652,7 @@ class Doku_Parser_Mode_smiley extends Doku_Parser_Mode {
$sep = '';
foreach ( $this->smileys as $smiley ) {
- $this->pattern .= $sep.Doku_Lexer_Escape($smiley);
+ $this->pattern .= $sep.'(?<=\W)'.Doku_Lexer_Escape($smiley).'(?=\W)';
$sep = '|';
}
}