@@ -709,7 +709,19 @@ def custom():
else:
user_notice = '0'
- return ['', '', user_icon, user_head, email, user_name, user_admin, user_ban, user_notice, user_acl_list]
+ return [
+ '',
+ user_icon,
+ user_head,
+ email,
+ user_name,
+ user_admin,
+ user_ban,
+ user_notice,
+ user_acl_list,
+ ip
+ ]
def load_skin(data = '', set_n = 0):
skin_return_data = ''
@@ -1,6 +1,6 @@
{
"master" : {
- "r_ver" : "v3.1.5-master-29",
+ "r_ver" : "v3.1.5-master-30",
"c_ver" : "400007",
"s_ver" : "6"
}, "stable" : {
@@ -13,7 +13,11 @@
<link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">
{{imp[1][5]|safe}}
{{imp[2][3]|safe}}
- <meta name="title" content="{{imp[0]}} - {{imp[1][0]}}">
+ {% if imp[3][0] != 0 %}
+ <meta name="title" content="{{imp[0]}} ({{imp[3][0]}}) - {{imp[1][0]}}">
+ {% else %}
+ <meta name="title" content="{{imp[0]}} - {{imp[1][0]}}">
+ {% endif %}
<meta name="keywords" content="{{imp[0]}}">
<meta name="description" content="{{data|cut_100}}">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -1,5 +1,5 @@
"name" : "Marisa",
- "skin_ver" : "v1.1.4",
+ "skin_ver" : "v1.1.5",
"require_ver" : "6"
}