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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-05-13 15:27:48 +02:00
commit eecb8f9cc9
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/relation.lib.php
View File

@ -1233,13 +1233,10 @@ function PMA_getForeignData(
$f_query_limit = isset($foreign_limit) ? $foreign_limit : '';
if (!empty($foreign_filter)) {
$res = $GLOBALS['dbi']->query(
$the_total = $GLOBALS['dbi']->fetchValue(
'SELECT COUNT(*)' . $f_query_from . $f_query_filter
);
if ($res) {
$the_total = $GLOBALS['dbi']->fetchValue($res);
@$GLOBALS['dbi']->freeResult($res);
} else {
if ($the_total === false) {
$the_total = 0;
}
}