From a76693ef4c57a12e2d09a48948840627f5543817 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 May 2015 04:27:49 -0400
Subject: [PATCH] Fix replacing :$, :-$, O:) and O:-) with emoticons (#1490408, #1490409)
---
plugins/emoticons/emoticons.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php
index 187e838..f3f987a 100644
--- a/plugins/emoticons/emoticons.php
+++ b/plugins/emoticons/emoticons.php
@@ -36,8 +36,6 @@
// map of emoticon replacements
$map = array(
- '/:\)/' => $this->img_tag('smiley-smile.gif', ':)' ),
- '/:-\)/' => $this->img_tag('smiley-smile.gif', ':-)' ),
'/(?<!mailto):D/' => $this->img_tag('smiley-laughing.gif', ':D' ),
'/:-D/' => $this->img_tag('smiley-laughing.gif', ':-D' ),
'/:\(/' => $this->img_tag('smiley-frown.gif', ':(' ),
@@ -54,8 +52,10 @@
'/(?<!mailto):-@/i' => $this->img_tag('smiley-yell.gif', ':-@' ),
'/O:\)/i' => $this->img_tag('smiley-innocent.gif', 'O:)' ),
'/O:-\)/i' => $this->img_tag('smiley-innocent.gif', 'O:-)' ),
- '/(?<!mailto):$/' => $this->img_tag('smiley-embarassed.gif', ':$' ),
- '/(?<!mailto):-$/' => $this->img_tag('smiley-embarassed.gif', ':-$' ),
+ '/(?<!O):\)/' => $this->img_tag('smiley-smile.gif', ':)' ),
+ '/(?<!O):-\)/' => $this->img_tag('smiley-smile.gif', ':-)' ),
+ '/(?<!mailto):\$/' => $this->img_tag('smiley-embarassed.gif', ':$' ),
+ '/(?<!mailto):-\$/' => $this->img_tag('smiley-embarassed.gif', ':-$' ),
'/(?<!mailto):\*/i' => $this->img_tag('smiley-kiss.gif', ':*' ),
'/(?<!mailto):-\*/i' => $this->img_tag('smiley-kiss.gif', ':-*' ),
'/(?<!mailto):S/i' => $this->img_tag('smiley-undecided.gif', ':S' ),
--
Gitblit v1.9.1