fix error for dbq

diff --git a/lib/php/db/index.php b/lib/php/db/index.php
index 9f47e7bd64d65bc686f6643c9bbd1250821c2c4f..315cef3d52b06945fbf99e79e44886b140cd062d 100755 (executable)
--- a/lib/php/db/index.php
+++ b/lib/php/db/index.php
@@ -6,7 +6,7 @@
 *
 * lib/php/db/index.php
 */
-require_once(realpath(dirname(__FILE__).'/page.php')); return;
+#require_once(realpath(dirname(__FILE__).'/page.php')); return;
 require_once(realpath(dirname(__FILE__).'/init.php'));
 
 if(defined('DB_NO_ACTION') and DB_NO_ACTION) return true;
@@ -14,7 +14,7 @@ if(defined('DB_NO_ACTION') and DB_NO_ACTION) return true;
 # Happend when include from a function
 if (!isset($Db)) global $Db, $Table;
 
-switch ($Db->mime2ext($Db->content_type())) {
+switch ($Db->mime2ext($Db->client_content_type())) {
   case "html":
     $Db->pdef('format','table');
     break;

diff --git a/lib/php/nb.php b/lib/php/nb.php
index a04b01a7f06b17db34c47846d63669d6be7feab3..64508bf149a32458e2b8de17c39ab4bb05b5109f 100644 (file)
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -151,7 +151,7 @@ class NB {
     }
 
     // Aliases
-    if (isset($aliases[$ext])) return self::ext2mime($aliases[$ext]);
+    if (isset($aliases[$mime])) return self::ext2mime($aliases[$mime]);
 
   }