Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

This commit is contained in:
Weblate 2013-05-02 10:58:55 +02:00
commit ee68495176
3 changed files with 16 additions and 1 deletions

View File

@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
- bug #3899 Git commit links to Github missing
- bug #3900 CSP WARN in Firefox console
- bug #3901 Setup script warning for config auth (stored login data) shows link BBcode
- bug #3895 [browse] Fixed getting BLOB data
4.0.0.0 (not yet released)
+ Patch #3481047 for rfe #3480477 Insert as new row enhancement

View File

@ -5415,7 +5415,7 @@ class PMA_DisplayResults
/* Create link to download */
if (count($url_params) > 0) {
$result = '<a href="tbl_get_field.php'
. PMA_generate_common_url($url_params) . '">'
. PMA_generate_common_url($url_params) . '" class="disableAjax">'
. $result . '</a>';
}
}

View File

@ -12,6 +12,20 @@
require_once 'libraries/common.inc.php';
require_once 'libraries/mime.lib.php';
/**
* Sets globals from $_GET
*/
$get_params = array(
'where_clause',
'transform_key'
);
foreach ($get_params as $one_get_param) {
if (isset($_GET[$one_get_param])) {
$GLOBALS[$one_get_param] = $_GET[$one_get_param];
}
}
/* Check parameters */
PMA_Util::checkParameters(
array('db', 'table', 'where_clause', 'transform_key')