Editor treats NULL as empty string

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1039 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 8318968f441a2388d427bbca53a787f5c8c1b803..cb1e1be7a423fc9c3433249863ad6280abb143f1 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -313,7 +313,7 @@ function input($field, $value, $function) {
                $functions = (isset($_GET["select"]) ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
                $first = array_search("", $functions) + (isset($_GET["select"]) ? 1 : 0);
                $onchange = ($first ? " onchange=\"var f = this.form['function[" . addcslashes($name, "\r\n'\\") . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\"" : "");
-               echo (count($functions) > 1 ? "<select name='function[$name]'>" . optionlist($functions, $function) . "</select>" : nbsp($functions[0])) . '<td>';
+               echo (count($functions) > 1 ? "<select name='function[$name]'>" . optionlist($functions, in_array($function, $functions) ? $function : "") . "</select>" : nbsp($functions[0])) . '<td>';
                $input = $adminer->editInput($_GET["edit"], $field, " name='fields[$name]'$onchange", $value); // usage in call is without a table
                if (strlen($input)) {
                        echo $input;