harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
harukin絵文字の追加

See merge request harukin/core!4
This commit is contained in:
harukin 2018-10-29 13:40:10 +09:00
commit f687739cfe
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/emoticons/harukin.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

6
include/text.php
View File

@ -1245,7 +1245,8 @@ function list_smilies($default_only = false) {
':coffee',
':facepalm',
':like',
':dislike'
':dislike',
':harukin:'
);
$icons = array(
@ -1279,7 +1280,8 @@ function list_smilies($default_only = false) {
'<img class="smiley" src="' . z_root() . '/images/emoticons/coffee.gif" alt=":coffee" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-facepalm.gif" alt=":facepalm" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/like.gif" alt=":like" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />'
'<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/harukin.png" alt=":harukin:" height="17px" width="17px" />'
);