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

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2017-03-01 12:41:32 +01:00
commit 002c39877e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -94,6 +94,7 @@ phpMyAdmin - ChangeLog
- issue #13033 Use Referrer-Policy header to specify referrer policy
- issue Fixed javascript confirmation of dangerous queries
- issue #13040 Compatibility with hhvm 3.18
- issue #13031 Fixed displaying of all rows
4.6.6 (2017-01-23)
- issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

9
libraries/DisplayResults.php
View File

@ -867,13 +867,10 @@ class DisplayResults
}
// Move to the next page or to the last one
$endpos = $_SESSION['tmpval']['pos']
+ $_SESSION['tmpval']['max_rows'];
if ($this->__get('unlim_num_rows') === false // view with unknown number of rows
|| ($endpos < $this->__get('unlim_num_rows')
&& $this->__get('num_rows') >= $_SESSION['tmpval']['max_rows']
&& $_SESSION['tmpval']['max_rows'] != self::ALL_ROWS)
|| ($_SESSION['tmpval']['max_rows'] != self::ALL_ROWS
&& $_SESSION['tmpval']['pos'] + $_SESSION['tmpval']['max_rows'] < $this->__get('unlim_num_rows')
&& $this->__get('num_rows') >= $_SESSION['tmpval']['max_rows'])
) {
$table_navigation_html