From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Wed, 21 Sep 2016 22:18:32 +0000 (+0100)
Subject: missing /etc/dbs.yaml
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=a61130ecbe8dba4c382eeace2913306a895803c7;p=nb.git

missing /etc/dbs.yaml
---

diff --git a/lib/php/db.php b/lib/php/db.php
index dcdcc9e5..32ecb083 100644
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -568,13 +568,13 @@ class Db extends nb {
       $params = (array)$params;
 
       # If _default exists spush it to all dbs's _import
-# NB 21.09.16       if ($id == '_default') {
-# NB 21.09.16         continue;
-# NB 21.09.16       } elseif(!empty($dbs['_default'])) {
-# NB 21.09.16         if (empty($params['_import'])) $params['_import'] = [];
-# NB 21.09.16         elseif (is_scalar($params['_import'])) $params['_import'] = (array)$params['_import'];
-# NB 21.09.16         $params['_import'][] = '_default';
-# NB 21.09.16       }
+      if ($id == '_default') {
+        continue;
+      } elseif(!empty($dbs['_default'])) {
+        if (empty($params['_import'])) $params['_import'] = [];
+        elseif (is_scalar($params['_import'])) $params['_import'] = (array)$params['_import'];
+        $params['_import'][] = '_default';
+      }
 
       foreach ($params as $k => $v) {
         if ($k != '_import') continue;