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

Merge branch 'develop' into 'origin'

Browse Source 
# Conflicts:
#   view/ja/hstrings.php
This commit is contained in:
harukin
2019-12-29 13:31:01 +09:00
parent 6f93d9848c fc9a901c4c
commit e1922bd555
41 changed files with 3616 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/text.php
View File

@@ -1300,7 +1300,11 @@ function list_smilies($default_only = false) {
':coffee',
':facepalm',
':like',
':dislike'
':dislike',
':harukin:',
':archlinux:',
'欲しい！！',
'5000兆円'
);
$icons = array(
@@ -1334,7 +1338,11 @@ 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="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" />'
);