Fix type errors in templates

theme-next · Nov 10, 2019 · c78f3ab · c78f3ab
1 parent d1eefd5
commit c78f3ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/layout/_partials/footer.swig b/layout/_partials/footer.swig
@@ -4,8 +4,9 @@
     {%- if theme.footer.beian.gongan_icon_url %}
       <img src="{{ theme.footer.beian.gongan_icon_url }}" style="display: inline-block;">
     {%- endif %}
-    {{- next_url('http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=' + theme.footer.beian.gongan_id,
-    theme.footer.beian.gongan_num + ' ') }}
+    {%- if theme.footer.beian.gongan_id and theme.footer.beian.gongan_num %}
+      {{- next_url('http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=' + theme.footer.beian.gongan_id, theme.footer.beian.gongan_num + ' ') }}
+    {%- endif %}
   </div>
 {%- endif %}
 

diff --git a/scripts/filters/locals.js b/scripts/filters/locals.js
@@ -16,7 +16,7 @@ hexo.extend.filter.register('template_locals', locals => {
   locals.author = __('author') !== 'author' ? __('author') : config.author;
   locals.description = __('description') !== 'description' ? __('description') : config.description;
   // RSS
-  locals.rss = (theme.rss !== false) && (theme.rss || (config.feed && config.feed.path) || 'atom.xml');
+  locals.rss = (theme.rss !== false) && (theme.rss || (config.feed && config.feed.path.toString()) || 'atom.xml');
   // PJAX
   locals.pjax = theme.pjax ? ' pjax' : '';
 });