Avoid traversing undefined variables

theme-next · Nov 27, 2019 · 121760b · 121760b
1 parent 7542558
commit 121760b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/scripts/events/lib/config.js b/scripts/events/lib/config.js
@@ -5,7 +5,7 @@ function isObject(item) {
 }
 
 function merge(target, source) {
-  for (const key of Object.keys(source)) {
+  for (const key in source) {
     if (isObject(target[key]) && isObject(source[key])) {
       merge(target[key], source[key]);
     } else {

diff --git a/scripts/helpers/next-url.js b/scripts/helpers/next-url.js
@@ -5,7 +5,7 @@
 const { htmlTag } = require('hexo-util');
 const url = require('url');
 
-hexo.extend.helper.register('next_url', function(path, text, options) {
+hexo.extend.helper.register('next_url', function(path, text, options = {}) {
   const { config } = this;
   var data = url.parse(path);
   var siteHost = url.parse(config.url).hostname || config.url;
@@ -26,9 +26,7 @@ hexo.extend.helper.register('next_url', function(path, text, options) {
     };
   }
 
-  options = options || {};
-
-  for (let key of Object.keys(options)) {
+  for (let key in options) {
     /**
      * If option have `class` attribute, add it to
      * 'exturl' class if `exturl` option enabled.