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

Make sure $limit is initialized

Browse Source
This commit is contained in:
Piotr Przybylski
2011-05-03 14:26:55 +02:00
parent 2c3fa8aa7c
commit 56476bc74d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/database_interface.lib.php
View File

@@ -282,7 +282,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
SELECT *, SELECT *,
`TABLE_SCHEMA` AS `Db`, `TABLE_SCHEMA` AS `Db`,
`TABLE_NAME` AS `Name`, `TABLE_NAME` AS `Name`,
`TABLE_TYPE` ÀS `TABLE_TYPE`, `TABLE_TYPE` AS `TABLE_TYPE`,
`ENGINE` AS `Engine`, `ENGINE` AS `Engine`,
`ENGINE` AS `Type`, `ENGINE` AS `Type`,
`VERSION` AS `Version`, `VERSION` AS `Version`,
@@ -479,7 +479,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
* returns array with databases containing extended infos about them * returns array with databases containing extended infos about them
* *
* @todo move into PMA_List_Database? * @todo move into PMA_List_Database?
* @param string $databases database * @param string $database database
* @param boolean $force_stats retrieve stats also for MySQL < 5 * @param boolean $force_stats retrieve stats also for MySQL < 5
* @param resource $link mysql link * @param resource $link mysql link
* @param string $sort_by column to order by * @param string $sort_by column to order by
@@ -508,9 +508,8 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
* if $GLOBALS['cfg']['NaturalOrder'] is enabled, we cannot use LIMIT * if $GLOBALS['cfg']['NaturalOrder'] is enabled, we cannot use LIMIT
* cause MySQL does not support natural ordering, we have to do it afterward * cause MySQL does not support natural ordering, we have to do it afterward
*/ */
if ($GLOBALS['cfg']['NaturalOrder']) {
$limit = ''; $limit = '';
} else { if (!$GLOBALS['cfg']['NaturalOrder']) {
if ($limit_count) { if ($limit_count) {
$limit = ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset; $limit = ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset;
} }