From 710bd08c303b0fc04992ea6544acf9e36c51b8e7 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 4 Feb 2015 08:47:57 +0100
Subject: [PATCH] adopting red matrix iconography for red#

---
 images/rm-16.png | Bin 0 -> 676 bytes
 include/text.php |   6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 images/rm-16.png

diff --git a/images/rm-16.png b/images/rm-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..9361ef2b70cbe24de0a120774a070ecc54d3e110
GIT binary patch
literal 676
zcmV;V0$crwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000F>000F>0l~ET8UO$Q8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10wGC6K~y-6t&>4WlVKRgfA6Q$K3(ZS2r+6(&BfHV8B3u<-9$Q7
zC$Du&@DO;|B?<BpA-fuMD9}S-hlU^tVd3URn?um8!Ipt3gNmhd-!}K{?XZ0|Vs)tp
z-ox|o{-6K<|L{CQN=a>mgu_~*VNAdvl?M=(5N<@DbIWL=_P;o8AcP3ungFH&mHMFp
zo?#+hszAj6ui^9oGX{7dI*-lg1wge~aKsll`{<qu%&g(`A%r+?5WqDd5u*l8)0xw>
zUa}%fB>-Cb&ZG98Lq9kKKq5w~YEeSMVXewWX*q#vv(R?^G61Eo8C07E^H4tkdRC*k
zyUXC24he@<tm2vy@BrY{wL$D}Xa8WoI)sm(iP~;foWoSZT{`arRsf+Wl=B5l9qpJp
z+DXqY@MAeh>%aw&u>0f%`|sAt1~!a-S>eaE3v|}9^sPSQ<WN6B^HpT=h$}fixvdl%
z&avMG?J4zSs=XHS+k2F?0?plBh$a)-)~C9bgdf*y;0Ay@vqD3g`L8pGUc7}C-!@X8
zA|Y&KndKmdkvIVP<PMpo0QuAx01m@3GD`vUtoDl?J}8aob5u5r#O+DaPhSDB`}jGr
zk#P>*uLF?0^N`rcIK`c`f!7rDd8NAB9;4b~?*SmUnXJsi-h<T3wX%)yxMeh<01OlH
z3gjX{Su3!=5=Prh0dSQ5&bOCuC>M$~(&geX5ik6QV-o**&OZUrpy2p%?SOXx0000<
KMNUMnLSTY~YB7}n

literal 0
HcmV?d00001

diff --git a/include/text.php b/include/text.php
index b45c2765eb..f77f81e7d7 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1110,7 +1110,8 @@ function smilies($s, $sample = false) {
 		':like',
 		':dislike',
                 '~friendica',
-                'red#'
+                'red#',
+		'red#matrix'
 
 	);
 
@@ -1148,7 +1149,8 @@ function smilies($s, $sample = false) {
 		'<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
 		'<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
 		'<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-		'<a href="http://redmatrix.me/">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
+		'<a href="http://redmatrix.me/">red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>',
+		'<a href="http://redmatrix.me/">red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);