From: jakubvrana Date: Wed, 7 Oct 2009 15:52:34 +0000 (+0000) Subject: Remove intval X-Git-Tag: v3.0.0~357 X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=ddb0a34b456469bfdb00e29b32b2e58be5a7c9c7;p=adminer.git Remove intval git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1178 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php index d2e368f5..7c88716a 100644 --- a/adminer/processlist.inc.php +++ b/adminer/processlist.inc.php @@ -2,7 +2,7 @@ if ($_POST && !$error) { $killed = 0; foreach ((array) $_POST["kill"] as $val) { - if (queries("KILL " . intval($val))) { + if (queries("KILL " . ereg_replace("[^0-9]+", "", $val))) { $killed++; } } diff --git a/adminer/select.inc.php b/adminer/select.inc.php index d78ac68e..de6d4634 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -151,7 +151,7 @@ if (!$columns) { $adminer->selectActionPrint($text_length); echo "\n"; - $query = "SELECT " . (intval($limit) && $group && count($group) < count($select) ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by . (strlen($limit) ? " LIMIT " . intval($limit) . (intval($_GET["page"]) ? " OFFSET " . ($limit * $_GET["page"]) : "") : ""); + $query = "SELECT " . (intval($limit) && $group && count($group) < count($select) ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by . (strlen($limit) ? " LIMIT " . intval($limit) . ($_GET["page"] ? " OFFSET " . ($limit * $_GET["page"]) : "") : ""); echo $adminer->selectQuery($query); $result = $connection->query($query);