Fix saving NULL value

This reverts commit ed130065.

Conflicts:
	adminer/drivers/mongo.inc.php
	adminer/include/functions.inc.php

diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php
index 7e4d481a5d4d5ffa948a1676a48ee8bc0203e1c3..2f152c293443001d97800940798b7e83488d88c3 100644 (file)
--- a/adminer/drivers/mongo.inc.php
+++ b/adminer/drivers/mongo.inc.php
@@ -116,10 +116,6 @@ if (isset($_GET["mongo"])) {
        class Min_Driver extends Min_SQL {
                public $primary = "_id";
                
-               function quote($value) {
-                       return ($value === null ? $value : parent::quote($value));
-               }
-               
                function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
                        $select = ($select == array("*")
                                ? array()

diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php
index abedc6042e2676d94bd21759de139724a8b1ad18..2b06e90a546b936d2a4afa13e00e018ffadca677 100644 (file)
--- a/adminer/include/driver.inc.php
+++ b/adminer/include/driver.inc.php
@@ -10,14 +10,6 @@
                $this->_conn = $connection;
        }
        
-       /** Quote a SQL string or null value
-       * @param string
-       * @return string
-       */
-       function quote($value) {
-               return ($value === null ? "NULL" : $this->_conn->quote($value));
-       }
-       
        /** Select data from table
        * @param string
        * @param array result of $adminer->selectColumnsProcess()[0]

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 251dfdfecc04c7cd7b581886d147287a49bbd282..96d4713bd98e262b71a39704ee2004f57b7667c5 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -285,13 +285,13 @@ function get_password() {
        return $return;
 }
 
-/** Shortcut for $driver->quote($string)
+/** Shortcut for $connection->quote($string)
 * @param string
 * @return string
 */
 function q($string) {
-       global $driver;
-       return $driver->quote($string);
+       global $connection;
+       return $connection->quote($string);
 }
 
 /** Get list of values from database
@@ -937,7 +937,7 @@ function process_input($field) {
                return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false);
        }
        if ($function == "NULL") {
-               $value = null;
+               return "NULL";
        }
        if ($field["type"] == "set") {
                return array_sum((array) $value);

diff --git a/changes.txt b/changes.txt
index 07667b2d82986ad9f44550ae69214d7cb1acf380..ea8d92a807f8343db0141dbb01f71cd996d76e9f 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -4,6 +4,7 @@ Unlock session in alter database
 Make master key unreadable to others (bug #410)
 Fix edit by long non-utf8 string
 Specify encoding for PHP 5.6 with invalid default_charset
+Fix saving NULL value, bug since Adminer 4.0.3
 MySQL: Use utf8mb4 if available
 Elasticsearch: Use where in select
 Danish translation