From c4861494e9ca7ff297c80341ea30f5b3f8a933f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 22 Jul 2016 16:04:18 +0200 Subject: [PATCH] Simplify fields number calcualtion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/create_addfield.lib.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php index b800efea64..f3960017a6 100644 --- a/libraries/create_addfield.lib.php +++ b/libraries/create_addfield.lib.php @@ -446,21 +446,19 @@ function PMA_getTableCreationQuery($db, $table) function PMA_getNumberOfFieldsFromRequest() { if (isset($_REQUEST['submit_num_fields'])) { // adding new fields - $num_fields = min( - 4096, - intval($_REQUEST['orig_num_fields']) + intval($_REQUEST['added_fields']) - ); + $num_fields = intval($_REQUEST['orig_num_fields']) + intval($_REQUEST['added_fields']); } elseif (isset($_REQUEST['orig_num_fields'])) { // retaining existing fields - $num_fields = min(4096, intval($_REQUEST['orig_num_fields'])); + $num_fields = intval($_REQUEST['orig_num_fields']); } elseif (isset($_REQUEST['num_fields']) && intval($_REQUEST['num_fields']) > 0 ) { // new table with specified number of fields - $num_fields = min(4096, intval($_REQUEST['num_fields'])); + $num_fields = intval($_REQUEST['num_fields']); } else { // new table with unspecified number of fields $num_fields = 4; } - return $num_fields; + // Limit to 4096 fields (MySQL maximal value) + return min($num_fields, 4096); } /**