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

This commit is contained in:
Weblate 2017-03-30 13:11:05 +02:00
commit 2233104590
2 changed files with 2 additions and 1 deletions

View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.7.1 (not yet released)
- issue #13132 Always execute tracking queries as controluser
4.7.0 (2017-03-28)
- patch #12233 [Display] Improve message when renaming database to same name

View File

@ -127,7 +127,7 @@ class Tracker
" AND table_name = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " .
" ORDER BY version DESC LIMIT 1";
$result = $GLOBALS['dbi']->fetchValue($sql_query);
$result = $GLOBALS['dbi']->fetchValue($sql_query, 0, 0, $GLOBALS['controllink']);
return ($result == 1);
}