Merge branch 'develop' into 'master'

5000兆円欲しい!!

See merge request harukin/core!8
This commit is contained in:
harukin 2018-11-01 23:03:07 +09:00
commit a776210aa7
4 changed files with 7 additions and 3 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -1247,7 +1247,9 @@ function list_smilies($default_only = false) {
':like',
':dislike',
':harukin:',
':archlinux:'
':archlinux:',
'欲しい!!',
'5000兆円'
);
$icons = array(
@ -1282,8 +1284,10 @@ function list_smilies($default_only = false) {
'<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/harukin.png" alt=":harukin:" height="17px" width="17px" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/archlinux.png" alt=":archlinux:" height="17px" width="17px" />'
'<img class="smiley" src="' . z_root() . '/images/emoticons/harukin.png" alt=":harukin:" height="17em" width="auto" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/archlinux.png" alt=":archlinux:" height="17em" width="auto" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/欲しい!!.png" alt="欲しい!!" height="50em" width="auto" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/5000兆円.png" alt="5000兆円" height="50em" width="auto" />'
);