Mandatory $where in where()

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

diff --git a/download.inc.php b/download.inc.php
index bb9e0497ebe227cacc61bb5009173744740f25df..8ac7d4ed2a89ed1cc80afdef3cdfc67d203885a4 100644 (file)
--- a/download.inc.php
+++ b/download.inc.php
@@ -1,3 +1,3 @@
 <?php
 header("Content-Type: application/octet-stream");
-echo $mysql->result($mysql->query("SELECT " . idf_escape($_GET["field"]) . " FROM " . idf_escape($_GET["download"]) . " WHERE " . implode(" AND ", where()) . " LIMIT 1"));
+echo $mysql->result($mysql->query("SELECT " . idf_escape($_GET["field"]) . " FROM " . idf_escape($_GET["download"]) . " WHERE " . implode(" AND ", where($_GET)) . " LIMIT 1"));

diff --git a/edit.inc.php b/edit.inc.php
index 12bdb0db97ee6194459039f89e8e7c44b9defd2f..66136ef7ea7a218ef6c4fe749672bb0f26dd97af 100644 (file)
--- a/edit.inc.php
+++ b/edit.inc.php
@@ -1,5 +1,5 @@
 <?php
-$where = where();
+$where = where($_GET);
 $fields = fields($_GET["edit"]);
 foreach ($fields as $name => $field) {
        if (isset($_GET["default"]) ? $field["auto_increment"] || preg_match('~text|blob~', $field["type"]) : !isset($field["privileges"][$where ? "update" : "insert"])) {

diff --git a/functions.inc.php b/functions.inc.php
index 3305e9e251358db9230726f9476f4dbb0aecebcb..78ea807d997e3874c49d14aa38ce5b44272befd9 100644 (file)
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -137,11 +137,8 @@ function unique_idf($row, $indexes) {
        return $return;
 }
 
-function where($where = null) {
+function where($where) {
        global $mysql;
-       if (!isset($where)) {
-               $where = $_GET;
-       }
        $return = array();
        foreach ((array) $where["where"] as $key => $val) {
                $return[] = idf_escape(bracket_escape($key, "back")) . " = BINARY '" . $mysql->escape_string($val) . "'"; //! enum and set