Merge branch 'master' into remove-down-server

alxndrsn · Aug 14, 2023 · 7062562 · 7062562
2 parents eaffa24 + 307dea3
commit 7062562
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -21,7 +21,7 @@
       })();
     </script>
     <link href='//fonts.googleapis.com/css?family=Lato:400,700|Open+Sans:400,700' rel='stylesheet' type='text/css'>
-    <link rel="icon" href="/static/favicon.ico" type="image/x-icon"/>
+    <link rel="icon" href="{{ site.baseurl }}/static/favicon.ico" type="image/x-icon"/>
   </head>
 
   <body data-spy="scroll" data-target="#sidebar">

diff --git a/docs/index.md b/docs/index.md
@@ -59,7 +59,7 @@ db.replicate.to('http://example.com/mydb');
 
         <img
           class="icon icon-lg"
-          src="{{ site.base_url }}/static/img/index/node.svg"
+          src="{{ site.baseurl }}/static/img/index/node.svg"
           alt=""
         />
 
@@ -72,7 +72,7 @@ db.replicate.to('http://example.com/mydb');
 
         <img
           class="icon icon-lg"
-          src="{{ site.base_url }}/static/img/index/light.svg"
+          src="{{ site.baseurl }}/static/img/index/light.svg"
           alt=""
         />
 
@@ -86,7 +86,7 @@ db.replicate.to('http://example.com/mydb');
 
         <img
           class="icon icon-lg"
-          src="{{ site.base_url }}/static/img/index/learn.svg"
+          src="{{ site.baseurl }}/static/img/index/learn.svg"
           alt=""
         />
 
@@ -99,7 +99,7 @@ db.replicate.to('http://example.com/mydb');
 
         <img
           class="icon icon-lg"
-          src="{{ site.base_url }}/static/img/index/open.svg"
+          src="{{ site.baseurl }}/static/img/index/open.svg"
           alt=""
         />
 

diff --git a/packages/node_modules/pouchdb-core/src/adapter.js b/packages/node_modules/pouchdb-core/src/adapter.js
@@ -493,6 +493,7 @@ class AbstractPouchDB extends EventEmitter {
         cb = opts;
         opts = {};
       }
+      opts = opts || {};
       if (typeof id !== 'string') {
         return cb(createError(INVALID_ID));
       }