www/dbq/dbq.php

diff --git a/lib/php/page.php b/lib/php/page.php
index f9b065165dc14871ceb87ce70fa83843243f38aa..c9a2e16093c005e903e630d85f8a4c812eb7d66f 100644 (file)
--- a/lib/php/page.php
+++ b/lib/php/page.php
@@ -503,8 +503,8 @@ class Page extends nb {
           $text = $v[0];
           $attr = $v[1];
 
-            if (is_array($attr)) {
-          # k => v
+          if (is_array($attr)) {
+            # k => v
             $attr_ = $attr;
             $attr = [];
 

diff --git a/share/db/update.sh b/share/db/update.sh
index 0b3f1583f56e6a18856eac9f2d7d68a8eb44a5e8..3ecb7ad457cf513268a13a35245da3cd0a957c5f 100755 (executable)
--- a/share/db/update.sh
+++ b/share/db/update.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash --login
+#!/bin/bash --login
 set +e
 dir=$(dirname "$0")
 tmp=`mktemp -d`

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 0d45527682bb118c8b31df330572d555e0d90531..3dc497405ca7cd6540487ae5d2d7543c14ad7c71 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -357,10 +357,11 @@ class DbQ extends nb {
 
     $title = [];
     if (!empty($this->title)) $title['title'] = $this->title;
+
     foreach (array_unique(array_slice(array_keys($params),1,3)) as $k) {
       if (in_array($k,self::ACTIONS_NO_TITLE)) continue;
       $v = $params[$k];
-      $title[$k] = $v;
+      if ($v) $title[$k] = $v;
     }
 
 
@@ -384,6 +385,7 @@ class DbQ extends nb {
         ];
 
         $path .= $v . "/";
+        $title[$k] = $this->prettyText($v);
 
       }
 
@@ -391,7 +393,7 @@ class DbQ extends nb {
 
     }
 
-    return [$title,$nav];
+    return [array_values($title),$nav];
   }
 
   public function parse_uri() {