[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-476-g56476bc

[Piotr Przybylski]

The branch, master has been updated
       via  56476bc74df455405bd331ad82d0a88404c9b155 (commit)
      from  2c3fa8aa7cbc11d353b58922aa86e23f1ad06899 (commit)


- Log -----------------------------------------------------------------
commit 56476bc74df455405bd331ad82d0a88404c9b155
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Tue May 3 14:26:55 2011 +0200

    Make sure $limit is initialized

-----------------------------------------------------------------------

Summary of changes:
 libraries/database_interface.lib.php |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 842b891..22d9671 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -282,7 +282,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
            SELECT *,
                   `TABLE_SCHEMA`       AS `Db`,
                   `TABLE_NAME`         AS `Name`,
-                  `TABLE_TYPE`         ÀS `TABLE_TYPE`,
+                  `TABLE_TYPE`         AS `TABLE_TYPE`,
                   `ENGINE`             AS `Engine`,
                   `ENGINE`             AS `Type`,
                   `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
  *
  * @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   resource    $link           mysql link
  * @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
          * cause MySQL does not support natural ordering, we have to do it afterward
          */
-        if ($GLOBALS['cfg']['NaturalOrder']) {
-            $limit = '';
-        } else {
+        $limit = '';
+        if (!$GLOBALS['cfg']['NaturalOrder']) {
             if ($limit_count) {
                 $limit = ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset;
             }


hooks/post-receive
-- 
phpMyAdmin