From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 17 Nov 2016 09:15:07 +0000 (+0100)
Subject: docker, no decryption when dump db
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=14a9ce9617471e625c47906818a1c492b2123469;p=nb.git

docker, no decryption when dump db
---

diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh
index 7b81e9eb..dfdc5e86 100644
--- a/etc/profile.d/docker.sh
+++ b/etc/profile.d/docker.sh
@@ -27,7 +27,7 @@ docker_build() {
   fi
 
   local ex=0
-  if [ -n "$(docker images -q $docker_name 2>/dev/null)" ]; then
+  if [ -n "$(docker images -q $docker_name:latest 2>/dev/null)" ]; then
     echo "$FUNCNAME: $docker_name already build."
     ex=2
 
diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 4cad46f3..79a6eae2 100644
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -806,20 +806,20 @@ Class Table extends nb {
 
     # Parser on/off (default: on)
     if (!isset($opt['parser'])) $opt['parser'] = true;
-    $parse = $opt['parser'];
-    #bye($parse);
+    $parser = $opt['parser'];
+    #bye($parser);
 
     while ($row = $st->fetch(PDO::FETCH_ASSOC, PDO::FETCH_ORI_NEXT)) {
 
       $count++;
       $call = null;
 
-      $this->db()->table_row_decrypt($this,$row);
-      if ($parse and !empty($this->db()->row_parse)) {
+      if ($parser) $this->db()->table_row_decrypt($this,$row);
+      if ($parser and !empty($this->db()->row_parse)) {
         $call = $this->db()->row_parse; $call($row);
       }
 
-      if ($parse and !empty($this->row_parse_pre)) {
+      if ($parser and !empty($this->row_parse_pre)) {
         $call = $this->row_parse_pre; $call($row);
       }
 
@@ -830,7 +830,7 @@ Class Table extends nb {
 
       }
 
-      if ($parse and !empty($this->row_parse_post)) {
+      if ($parser and !empty($this->row_parse_post)) {
         $call = $this->row_parse_post; $call($row);
       }