gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MAINT_4_5_4' into QA_4_5

Browse Source
This commit is contained in:
Michal Čihař 2016-01-19 11:27:26 +01:00
commit 76e003a8cb
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db_create.php
View File

@ -17,6 +17,10 @@ if (! PMA_DRIZZLE) {
}
require 'libraries/build_html_for_db.lib.php';
if (! isset($_POST['new_db'])) {
PMA_Util::checkParameters(array('new_db'));
}
/**
* Defines the url to return to in case of error in a sql statement
*/

5
export.php
View File

@ -163,11 +163,12 @@ if (!defined('TESTSUITE')) {
}
$table = $GLOBALS['table'];
// sanitize this parameter which will be used below in a file inclusion
$what = PMA_securePath($_POST['what']);
PMA_Util::checkParameters(array('what', 'export_type'));
// sanitize this parameter which will be used below in a file inclusion
$what = PMA_securePath($_POST['what']);
// export class instance, not array of properties, as before
/* @var $export_plugin ExportPlugin */
$export_plugin = PMA_getPlugin(

7
gis_data_editor.php
View File

@ -23,6 +23,10 @@ require_once 'libraries/common.inc.php';
require_once 'libraries/gis/GIS_Factory.class.php';
require_once 'libraries/gis/GIS_Visualization.class.php';
if (! isset($_REQUEST['field'])) {
PMA_Util::checkParameters(array('field'));
}
// Get data if any posted
$gis_data = array();
if (PMA_isValid($_REQUEST['gis_data'], 'array')) {
@ -185,6 +189,9 @@ if ($geom_type == 'GEOMETRYCOLLECTION') {
}
for ($a = 0; $a < $geom_count; $a++) {
if (! isset($gis_data[$a])) {
continue;
}
if ($geom_type == 'GEOMETRYCOLLECTION') {
echo '<br/><br/>';

3
libraries/sql.lib.php
View File

@ -2029,7 +2029,8 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
// (the parser never sets the 'union' key to 0).
// Handling is also not required if we came from the "Sort by key"
// drop-down.
if (PMA_isRememberSortingOrder($analyzed_sql_results)
if (! empty($analyzed_sql_results)
&& PMA_isRememberSortingOrder($analyzed_sql_results)
&& empty($analyzed_sql_results['union'])
&& ! isset($_REQUEST['sort_by_key'])
) {

4
schema_export.php
View File

@ -22,6 +22,10 @@ require_once 'libraries/Index.class.php';
require_once 'libraries/pmd_common.php';
require_once 'libraries/plugin_interface.lib.php';
if (! isset($_REQUEST['export_type'])) {
PMA_Util::checkParameters(array('export_type'));
}
/**
* Include the appropriate Schema Class depending on $export_type
* default is PDF