lib/php/db.php

diff --git a/lib/php/db.php b/lib/php/db.php
index 0c624d2572de1497afff711c906a9f5d06475d68..95eb9108bd823499eab816806ab99d48d4740dc4 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -455,7 +455,8 @@ class Db extends nb {
     return str_replace(array_keys($replace),array_values($replace),$value);
   }
 
-  public function method($key=null,$args=null) {
+# NB 04.04.17   public function method($key=null,$args=null) {
+  public function method($key=null) {
     $method = $this->conf_type($key);
     if (is_callable($method)) return $this->unvar($method($this));
     return $this->unvar($method);

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index fc458c17de4840c29e1072233f15a2ec76f9dada..2399e0b46412465dc57c76f8c57484358157c96a 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -465,7 +465,7 @@ class DbQ extends nb {
   public function ssha_password($password='') {
     if ($password=='') $password = $this->params['table'];
     if ($password=='' and !empty($_POST['password'])) $password = $_POST['password'];
-    echo <<<EOF
+    if ($this->db->is_html) echo <<<EOF
 <form action="$this->uri" method="post">
 <label>Password: </label><input type="text" name="password" value="$password" />
 <input type="submit" />