friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #94 from beardy-unixer/master

Browse source 
Documentation changes
This commit is contained in:
Simon 2012-03-06 15:24:15 -08:00
commit 1fae778421
7 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/text.php Executable file → Normal file
View file

@ -738,6 +738,9 @@ function smilies($s, $sample = false) {
'~friendika',
'~friendica',
// 'Diaspora*'
':beard',
':whitebeard'
);
$icons = array(
@ -779,7 +782,8 @@ function smilies($s, $sample = false) {
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
// '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
'<img src="' . $a->get_baseurl() . '/images/beard.jpg" alt=":beard" />',
'<img src="' . $a->get_baseurl() . '/images/whitebeard.jpg" alt=":whitebeard" />'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);