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

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

Browse Source
This commit is contained in:
Weblate 2013-12-21 16:26:06 +01:00
commit 054614ff2b
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,7 +6,6 @@ phpMyAdmin - ChangeLog
- bug #2760 Warn about incomplete exports
- bug #4190 Fractional seconds cause row update even if the value is not changed
- bug #4170 Overflow scroll for table grid is not a good solution
- bug #2961 Relations settings not updated on config change
4.1.1.0 (2013-12-17)
- bug #4154 Error using UNION query

6
libraries/relation.lib.php
View File

@ -59,10 +59,6 @@ function PMA_queryAsControlUser($sql, $show_error = true, $options = 0)
*/
function PMA_getRelationsParam()
{
// avoid breakage if pmadb got unconfigured after login
if (empty($GLOBALS['cfg']['Server']['pmadb'])) {
unset($_SESSION['relation'][$GLOBALS['server']]);
}
if (empty($_SESSION['relation'][$GLOBALS['server']])) {
$_SESSION['relation'][$GLOBALS['server']] = PMA_checkRelationsParam();
}
@ -531,7 +527,7 @@ function PMA_checkRelationsParam()
) {
$cfgRelation['allworks'] = true;
}
error_log(var_export($cfgRelation, true));
return $cfgRelation;
} // end of the 'PMA_getRelationsParam()' function