From b75c3a4fc6f895c0299f4e4043fc49cc5945f7b8 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Fri, 12 Oct 2018 20:55:55 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E5=90=8D=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/admin_attachment.ftl       | 2 +-
 src/main/resources/templates/admin/admin_backup.ftl           | 2 +-
 src/main/resources/templates/admin/admin_category.ftl         | 2 +-
 src/main/resources/templates/admin/admin_comment.ftl          | 2 +-
 src/main/resources/templates/admin/admin_index.ftl            | 2 +-
 src/main/resources/templates/admin/admin_login.ftl            | 2 +-
 src/main/resources/templates/admin/admin_menu.ftl             | 2 +-
 src/main/resources/templates/admin/admin_option.ftl           | 2 +-
 src/main/resources/templates/admin/admin_page.ftl             | 2 +-
 src/main/resources/templates/admin/admin_page_gallery.ftl     | 2 +-
 src/main/resources/templates/admin/admin_page_link.ftl        | 2 +-
 src/main/resources/templates/admin/admin_page_md_editor.ftl   | 2 +-
 src/main/resources/templates/admin/admin_post.ftl             | 2 +-
 src/main/resources/templates/admin/admin_post_md_editor.ftl   | 4 ++--
 src/main/resources/templates/admin/admin_profile.ftl          | 2 +-
 src/main/resources/templates/admin/admin_tag.ftl              | 2 +-
 src/main/resources/templates/admin/admin_theme-editor.ftl     | 2 +-
 src/main/resources/templates/admin/admin_theme.ftl            | 2 +-
 src/main/resources/templates/common/error/500.ftl             | 2 +-
 .../templates/themes/material/_partial/post-info-share.ftl    | 2 +-
 20 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/templates/admin/admin_attachment.ftl b/src/main/resources/templates/admin/admin_attachment.ftl
index e4dada499..e14edaab3 100755
--- a/src/main/resources/templates/admin/admin_attachment.ftl
+++ b/src/main/resources/templates/admin/admin_attachment.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.attachments.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.attachments.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_backup.ftl b/src/main/resources/templates/admin/admin_backup.ftl
index 333724c04..d29e399fc 100644
--- a/src/main/resources/templates/admin/admin_backup.ftl
+++ b/src/main/resources/templates/admin/admin_backup.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.backup.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.backup.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_category.ftl b/src/main/resources/templates/admin/admin_category.ftl
index 1ab1277ef..1dcae4e05 100755
--- a/src/main/resources/templates/admin/admin_category.ftl
+++ b/src/main/resources/templates/admin/admin_category.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.categories.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.categories.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_comment.ftl b/src/main/resources/templates/admin/admin_comment.ftl
index f9cee5052..831b659ef 100755
--- a/src/main/resources/templates/admin/admin_comment.ftl
+++ b/src/main/resources/templates/admin/admin_comment.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.comments.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.comments.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl
index 2087bc9f0..bcd4c09f1 100755
--- a/src/main/resources/templates/admin/admin_index.ftl
+++ b/src/main/resources/templates/admin/admin_index.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.index.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.index.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_login.ftl b/src/main/resources/templates/admin/admin_login.ftl
index 7ad0a81db..87304c184 100755
--- a/src/main/resources/templates/admin/admin_login.ftl
+++ b/src/main/resources/templates/admin/admin_login.ftl
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <title>${options.blog_title} | <@spring.message code='login.page.title' /></title>
+    <title>${options.blog_title!} | <@spring.message code='login.page.title' /></title>
     <link rel="stylesheet" href="/static/plugins/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/static/plugins/animate/animate.min.css">
     <link rel="stylesheet" href="/static/plugins/toast/css/jquery.toast.min.css">
diff --git a/src/main/resources/templates/admin/admin_menu.ftl b/src/main/resources/templates/admin/admin_menu.ftl
index c624a4648..11fb3142d 100644
--- a/src/main/resources/templates/admin/admin_menu.ftl
+++ b/src/main/resources/templates/admin/admin_menu.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.menus.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.menus.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_option.ftl b/src/main/resources/templates/admin/admin_option.ftl
index df33d5a77..febf2cdc2 100755
--- a/src/main/resources/templates/admin/admin_option.ftl
+++ b/src/main/resources/templates/admin/admin_option.ftl
@@ -1,5 +1,5 @@
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.setting.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.setting.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_page.ftl b/src/main/resources/templates/admin/admin_page.ftl
index 75687c618..ed91ece24 100755
--- a/src/main/resources/templates/admin/admin_page.ftl
+++ b/src/main/resources/templates/admin/admin_page.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.pages.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.pages.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_page_gallery.ftl b/src/main/resources/templates/admin/admin_page_gallery.ftl
index 5ca776854..06b6314e8 100644
--- a/src/main/resources/templates/admin/admin_page_gallery.ftl
+++ b/src/main/resources/templates/admin/admin_page_gallery.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.pages.galleries.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.pages.galleries.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_page_link.ftl b/src/main/resources/templates/admin/admin_page_link.ftl
index 1dedd0545..561ee57b8 100755
--- a/src/main/resources/templates/admin/admin_page_link.ftl
+++ b/src/main/resources/templates/admin/admin_page_link.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.pages.links.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.pages.links.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_page_md_editor.ftl b/src/main/resources/templates/admin/admin_page_md_editor.ftl
index 1a99142a9..bb1db0839 100755
--- a/src/main/resources/templates/admin/admin_page_md_editor.ftl
+++ b/src/main/resources/templates/admin/admin_page_md_editor.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.pages.edit.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.pages.edit.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_post.ftl b/src/main/resources/templates/admin/admin_post.ftl
index d71e1f9db..a8088efcb 100755
--- a/src/main/resources/templates/admin/admin_post.ftl
+++ b/src/main/resources/templates/admin/admin_post.ftl
@@ -1,6 +1,6 @@
 <#compress >
     <#include "module/_macro.ftl">
-    <@head>${options.blog_title} | <@spring.message code='admin.posts.title' /></@head>
+    <@head>${options.blog_title!} | <@spring.message code='admin.posts.title' /></@head>
     <div class="wrapper">
         <!-- 顶部栏模块 -->
         <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_post_md_editor.ftl b/src/main/resources/templates/admin/admin_post_md_editor.ftl
index 8fd61eb78..4036effbc 100755
--- a/src/main/resources/templates/admin/admin_post_md_editor.ftl
+++ b/src/main/resources/templates/admin/admin_post_md_editor.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.posts.edit.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.posts.edit.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
@@ -47,7 +47,7 @@
                     <div style="display: block;margin-bottom: 10px;">
                         <span>
                             <@spring.message code='admin.editor.form.url' />
-                            <a href="#">${options.blog_url}/archives/<span id="postUrl"><#if post??>${post.postUrl}</#if></span>/</a>
+                            <a href="#">${options.blog_url!}/archives/<span id="postUrl"><#if post??>${post.postUrl}</#if></span>/</a>
                             <button class="btn btn-default btn-sm " id="btn_input_postUrl"><@spring.message code='common.btn.edit' /></button>
                             <button class="btn btn-default btn-sm " id="btn_change_postUrl" onclick="urlOnBlurAuto()" style="display: none;"><@spring.message code='common.btn.define' /></button>
                         </span>
diff --git a/src/main/resources/templates/admin/admin_profile.ftl b/src/main/resources/templates/admin/admin_profile.ftl
index cd3f59b91..21c8edeef 100644
--- a/src/main/resources/templates/admin/admin_profile.ftl
+++ b/src/main/resources/templates/admin/admin_profile.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.user.profile.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.user.profile.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_tag.ftl b/src/main/resources/templates/admin/admin_tag.ftl
index f26cbebe2..ce4f0b57f 100755
--- a/src/main/resources/templates/admin/admin_tag.ftl
+++ b/src/main/resources/templates/admin/admin_tag.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.tags.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.tags.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_theme-editor.ftl b/src/main/resources/templates/admin/admin_theme-editor.ftl
index 2533762f5..9972ba7d7 100644
--- a/src/main/resources/templates/admin/admin_theme-editor.ftl
+++ b/src/main/resources/templates/admin/admin_theme-editor.ftl
@@ -1,5 +1,5 @@
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.themes.edit.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.themes.edit.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_theme.ftl b/src/main/resources/templates/admin/admin_theme.ftl
index 75ba1dc3c..08449322c 100755
--- a/src/main/resources/templates/admin/admin_theme.ftl
+++ b/src/main/resources/templates/admin/admin_theme.ftl
@@ -1,6 +1,6 @@
 <#compress >
 <#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.themes.title' /></@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.themes.title' /></@head>
 <div class="wrapper">
     <!-- 顶部栏模块 -->
     <#include "module/_header.ftl">
diff --git a/src/main/resources/templates/common/error/500.ftl b/src/main/resources/templates/common/error/500.ftl
index 2a5fd38fe..1ba070fbe 100644
--- a/src/main/resources/templates/common/error/500.ftl
+++ b/src/main/resources/templates/common/error/500.ftl
@@ -35,7 +35,7 @@
             </div>
             <div class="footer">
                 <span>Copyright © 2018</span>
-                <a href="${options.blog_title}">${options.blog_title?default('Halo')}</a>
+                <a href="${options.blog_title!}">${options.blog_title?default('Halo')}</a>
                 <span style="float: right">
                         Background image from <a href="https://cn.bing.com/" target="_blank">Bing</a>.
                 </span>
diff --git a/src/main/resources/templates/themes/material/_partial/post-info-share.ftl b/src/main/resources/templates/themes/material/_partial/post-info-share.ftl
index 44f0d8bf5..733351376 100644
--- a/src/main/resources/templates/themes/material/_partial/post-info-share.ftl
+++ b/src/main/resources/templates/themes/material/_partial/post-info-share.ftl
@@ -50,7 +50,7 @@
 
     <!-- Share QQ -->
     <#if options.theme_material_sns_share_qq?if_exists=='true'>
-    <a class="post_share-link" href="http://connect.qq.com/widget/shareqq/index.html?site=${options.blog_title}&title=${post.postTitle}&summary=${post.postSummary?if_exists}&pics=&url=${options.blog_url}/archives/${post.postUrl}" target="_blank">
+    <a class="post_share-link" href="http://connect.qq.com/widget/shareqq/index.html?site=${options.blog_title!}&title=${post.postTitle}&summary=${post.postSummary?if_exists}&pics=&url=${options.blog_url}/archives/${post.postUrl}" target="_blank">
         <li class="mdl-menu__item">
             分享到QQ
         </li>