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 2013-06-24 15:32:43 +02:00
commit 76d8ca61ac
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/config.rst
View File

@ -1550,10 +1550,9 @@ Browse mode
:type: boolean
:default: false
Defines whether a user should be displayed a "Show all" button in
browse mode or not in all cases. By default it is shown only on small
tables (less than 5 × :config:option:`$cfg['MaxRows']` rows) to avoid
performance issues while getting too many rows.
Defines whether a user should be displayed a "Show all" button in browse
mode or not in all cases. By default it is shown only on small tables (less
than 500 rows) to avoid performance issues while getting too many rows.
.. config:option:: $cfg['MaxRows']

6
libraries/DisplayResults.class.php
View File

@ -666,7 +666,7 @@ class PMA_DisplayResults
// Display the "Show all" button if allowed
if (($this->__get('num_rows') < $this->__get('unlim_num_rows'))
&& ($GLOBALS['cfg']['ShowAll']
|| ($GLOBALS['cfg']['MaxRows'] * 5 >= $this->__get('unlim_num_rows')))
|| ($this->__get('unlim_num_rows') <= 500))
) {
$table_navigation_html .= $this->_getShowAllButtonForTableNavigation(
@ -908,9 +908,9 @@ class PMA_DisplayResults
. __('Number of rows:') . ' '
. '<select name="session_max_rows" class="autosubmit">';
$numberOfRowsChoices = array(25,50,100,250,500);
$numberOfRowsChoices = array(25, 50, 100, 250, 500);
foreach ($numberOfRowsChoices as $oneNumberOfRowsChoice) {
$additional_fields_html .= '<option value="'
$additional_fields_html .= '<option value="'
. $oneNumberOfRowsChoice . '"';
if ($oneNumberOfRowsChoice == $_SESSION['tmp_user_values']['max_rows']) {