diff --git a/ChangeLog b/ChangeLog index 5ee8714d13..5eecc92b97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,12 +16,22 @@ phpMyAdmin - ChangeLog + [interface] Upgraded CodeMirror to 3.x series + rfe #1363 Improved query profiler +4.0.4.0 (not yet released) +- bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click +- bug #3961 Avoid Suhosin warning when in simulation mode +- bug #3897 Row Statistics and Space usage bugs + 4.0.3.0 (not yet released) - bug #3941 Recent tables list always empty - bug #3933 Do not translate "Open Document" in export settings - bug #3927 List of tables is missing after expanding in the navigation frame - bug #3942 Warnings about reserved word for many non reserved words - bug #3912 Exporting row selection, resulted by ORDER BY query +- bug #3957 Cookies must be enabled past this point +- bug #3956 "Browse foreign values" search filter / page selector not working +- bug #3579 NOW() function incorrectly selected (partial regression) +- [security] Javascript execution vulnerability in Create view, + reported by Maxim Rupp (see PMASA-2013-6) 4.0.2.0 (2013-05-24) - bug #3902 Cannot browse when table name contains keyword "call" diff --git a/browse_foreigners.php b/browse_foreigners.php index 87a214f4e3..2a0efb53fa 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -9,7 +9,22 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/transformations.lib.php'; -$field = $_REQUEST['field']; +/** + * Sets globals from $_REQUEST + */ +$request_params = array( + 'field', + 'fieldkey', + 'foreign_filter', + 'pos', + 'rownumber' +); + +foreach ($request_params as $one_request_param) { + if (isset($_REQUEST[$one_request_param])) { + $GLOBALS[$one_request_param] = $_REQUEST[$one_request_param]; + } +} PMA_Util::checkParameters(array('db', 'table', 'field')); @@ -66,6 +81,7 @@ if (is_array($foreignData['disp_row'])) { if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) { $gotopage = PMA_Util::pageselector( + 'pos', $session_max_rows, $pageNow, $nbTotalPage, diff --git a/doc/config.rst b/doc/config.rst index 4d9dee50b3..755b4a0bc0 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2609,14 +2609,14 @@ SQL parser settings :type: string :default: ``'html'`` - The main use of the new :term:`SQL` Parser - is to pretty-print :term:`SQL` queries. By - default we use HTML to format the query, but you can disable this by + The main use of the :term:`SQL` Parser + is to format and analyze :term:`SQL` queries. By + default we use text to format the query, but you can disable this by setting this variable to ``'none'``. Available options: - * ``'html'`` + * ``'text'`` * ``'none'`` .. _cfg_SQP: diff --git a/index.php b/index.php index bae1f3de97..dae6941de4 100644 --- a/index.php +++ b/index.php @@ -535,6 +535,8 @@ if (isset($GLOBALS['dbi']) && !PMA_DRIZZLE) { */ if ($cfg['SuhosinDisableWarning'] == false && @ini_get('suhosin.request.max_value_length') + // warn about Suhosin only if its simulation mode is not enabled + && @ini_get('suhosin.simulation') == '0' ) { trigger_error( sprintf( diff --git a/js/tbl_select.js b/js/tbl_select.js index 7df822864a..4efb86ae39 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -175,7 +175,7 @@ AJAX.registerOnload('tbl_select.js', function () { ]; var outputGeomFunctions = binaryFunctions.concat(tempArray); - // If the chosen function takes two geomerty objects as parameters + // If the chosen function takes two geometry objects as parameters var $operator = $geomFuncSelector.parents('tr').find('td:nth-child(5)').find('select'); if ($.inArray($geomFuncSelector.val(), binaryFunctions) >= 0) { $operator.prop('readonly', true); diff --git a/libraries/Header.class.php b/libraries/Header.class.php index b833d2c99c..29988a274a 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -616,14 +616,6 @@ class PMA_Header { $retval = ''; if ($this->_warningsEnabled) { - // message of "Cookies required" displayed for auth_type http or config - // note: here, the decoration won't work because without cookies, - // our standard CSS is not operational - if (empty($_COOKIE)) { - $retval .= PMA_Message::notice( - __('Cookies must be enabled past this point.') - )->getDisplay(); - } $retval .= "