Changeset 966

Show
Ignore:
Timestamp:
01/13/08 12:33:59 (11 months ago)
Author:
rats
Message:

Fixed #953: update script fails to start

Updated phpMyAdmin to version 2.11.4 RC1 (#949)

Location:
trunk
Files:
1 added
1 removed
32 modified

Legend:

Unmodified
Added
Removed

  • trunk/CHANGELOG

    r965 r966  
    77\_________________________________________________________________/ 
    88 
     92008-01-13 Benedikt Heintel 
     10        - SETUP: 
     11                * Fixed #953: update script fails to start 
     12        - TOOLS: 
     13                * Updated phpMyAdmin to version 2.11.4 RC1 (#949) 
     14 
    9152008-01-13 Christian Hernmarck 
    1016        - ENGINE: 
    … …  
    1622        - SETUP: 
    1723                * Updated: added RC2 -> RC3 update to Update Script (not yet completed) 
     24                * Updated: Makefile for apache folder 
    1825 
    19262008-01-10 Benedikt Heintel 

  • trunk/configs/apache/Makefile

    r898 r966  
    1111        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/sites-available 
    1212        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/mods-available 
    13         $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/ispcp 
    1413 
    1514        cp ./httpd.conf $(SYSTEM_CONF)/apache 
    … …  
    3534 
    3635        rm -rf $(SYSTEM_CONF)/apache 
    37         rm -rf $(ROOT_APACHE_CONF)/ispcp.conf 
    38         rm -rf ${ROOT_APACHE_CONF}/mods-available/fastcgi_ispcp.conf 
     36        rm -rf $(APACHE_SITES_DIR)/ispcp.conf 
     37        rm -rf $(APACHE_SITES_DIR)/00_master.conf 
     38        rm -rf $(APACHE_SITES_DIR)/01_awstats.conf 
     39        rm -rf ${APACHE_MODS_DIR}/fastcgi_ispcp.conf 

  • trunk/engine/setup/ispcp-update

    r964 r966  
    378378        return $rs if ($rs != 0); 
    379379 
    380         $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql") 
     380        $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql"); 
    381381        if ($rs != 0) { 
    382382        print STDOUT "failed!\n"; 
    … …  
    573573        return $rs if ($rs != 0); 
    574574 
    575         $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql") 
     575        $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql"); 
    576576        if ($rs != 0) { 
    577577        print STDOUT "failed!\n"; 
    … …  
    636636        print STDOUT "\tRebuilding customers ..."; 
    637637 
    638         $rs = sys_command("$main::cfg{'ROOT_DIR'}/engine/ispcp-rqst-mngr"); 
     638        $rs = sys_command("$main::cfg{'CMD_SHELL'} $main::cfg{'ROOT_DIR'}/engine/ispcp-rqst-mngr"); 
    639639        if ($rs != 0) { 
    640640        print STDOUT "failed!\n"; 
    … …  
    701701        exit 1; 
    702702} 
    703  
    704 exit 0; 

  • trunk/gui/tools/pma/ChangeLog

    r942 r966  
    33---------------------- 
    44 
    5 $Id: ChangeLog 10967 2007-12-08 12:46:36Z lem9 $ 
     5$Id: ChangeLog 11046 2008-01-12 12:18:49Z lem9 $ 
    66$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ 
     7 
     82.11.4.0 (2008-01-12) 
     9- bug #1843428 [GUI] Space issue with DROP/DELETE/ALTER TABLE  
     10- bug #1807816 [search] regular expression search doesn't work with 
     11  backslashes 
     12- bug #1843463 [GUI] DROP PROCEDURE does not show alert  
     13- bug #1835904 [GUI] Back link after a SQL error forgets the query  
     14- bug #1835654 [core] wrong escaping when using double quotes  
     15- bug #1817612 [cookies] Wrong cookie path on IIS with PHP-CGI,  
     16  thanks to Carsten Wiedmann 
     17- bug #1848889 [export] export trigger should use DROP TRIGGER IF EXISTS 
     18- bug #1851833 [display] Sorting forgets an explicit LIMIT 
     19 (fix for sorting on column headers) 
     20- bug #1764182 [cookies] Suhosin cookie encryption breaks phpMyAdmin 
     21- bug #1798786 [import] Wrong error when a string contains semicolon 
     22- bug #1813508 [login] Missing parameter: field after re-login  
     23- bug #1710144 [parser] Space after COUNT breaks Export but not Query  
     24- bug #1783620 [parser] Subquery results without "as" are ignored  
     25- bug #1821264 [display] MaxTableList and INFORMATION_SCHEMA  
     26- bug #1859460 [display] Operations and many databases  
     27- bug #1814679 [display] Database selection pagination when switching servers  
     28- patch #1861717 [export] CSV Escape character not exported right, 
     29  thanks to nicolasdigraf 
     30- bug #1864468 [display] Theme does not switch to darkblue_orange  
     31- bug #1847409 [security] Path disclosure on darkblue_orange/layout.inc.php, 
     32  thanks to Jürgen Wind - windkiel 
    733 
    8342.11.3.0 (2007-12-08) 

  • trunk/gui/tools/pma/Documentation.html

    r942 r966  
    33<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" 
    44    version="-//W3C//DTD XHTML 1.1//EN" dir="ltr"> 
    5 <!-- $Id: Documentation.html 10967 2007-12-08 12:46:36Z lem9 $ --> 
     5<!-- $Id: Documentation.html 11046 2008-01-12 12:18:49Z lem9 $ --> 
    66<!-- 
    77    vim: expandtab ts=4 sw=4 sts=4 tw=78 
    … …  
    1212    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> 
    1313    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> 
    14     <title>phpMyAdmin 2.11.3 - Documentation</title> 
     14    <title>phpMyAdmin 2.11.4 - Documentation</title> 
    1515    <link rel="stylesheet" type="text/css" href="docs.css" /> 
    1616</head> 
    … …  
    3434</ul> 
    3535 
    36 <h1>phpMyAdmin 2.11.3 Documentation</h1> 
     36<h1>phpMyAdmin 2.11.4 Documentation</h1> 
    3737 
    3838<ul><li><a href="http://www.phpmyadmin.net/"> 
    … …  
    4949    </li> 
    5050    <li>Documentation version: 
    51         <i>$Id: Documentation.html 10967 2007-12-08 12:46:36Z lem9 $</i> 
     51        <i>$Id: Documentation.html 11046 2008-01-12 12:18:49Z lem9 $</i> 
    5252    </li> 
    5353</ul> 

  • trunk/gui/tools/pma/Documentation.txt

    r942 r966  
    1212  * Glossary 
    1313 
    14 phpMyAdmin 2.11.3 Documentation 
     14phpMyAdmin 2.11.4 Documentation 
    1515 
    1616  * phpMyAdmin homepage 
    … …  
    2121      + General notes: README 
    2222      + License: LICENSE 
    23   * Documentation version: $Id: Documentation.html 10967 2007-12-08 12:46:36Z 
     23  * Documentation version: $Id: Documentation.html 11046 2008-01-12 12:18:49Z 
    2424    lem9 $ 
    2525 

  • trunk/gui/tools/pma/README

    r942 r966  
    1 $Id: README 10967 2007-12-08 12:46:36Z lem9 $ 
     1$Id: README 11046 2008-01-12 12:18:49Z lem9 $ 
    22 
    33phpMyAdmin - Readme 
    … …  
    66  A set of PHP-scripts to manage MySQL over the web. 
    77 
    8   Version 2.11.3 
     8  Version 2.11.4 
    99  -------------- 
    1010  http://www.phpmyadmin.net/ 
    1111 
    1212    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> 
    13     Copyright (C) 2001-2007 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca> 
     13    Copyright (C) 2001-2008 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca> 
    1414                            Olivier Müller <om_at_omnis.ch> 
    1515                            Robin Johnson <robbat2_at_users.sourceforge.net> 

  • trunk/gui/tools/pma/browse_foreigners.php

    r891 r966  
    44 * display selection for relational field values 
    55 * 
    6  * @version $Id: browse_foreigners.php 10712 2007-10-03 16:34:12Z lem9 $ 
     6 * @version $Id: browse_foreigners.php 11035 2008-01-05 13:33:05Z lem9 $ 
    77 */ 
    88 
    … …  
    9696    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> 
    9797    <link rel="stylesheet" type="text/css" 
    98         href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" /> 
     98        href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getThemeUniqueValue(); ?>" /> 
    9999    <script src="./js/functions.js" type="text/javascript"></script> 
    100100    <script type="text/javascript"> 

  • trunk/gui/tools/pma/db_search.php

    r774 r966  
    4646 * @uses    sprintf() 
    4747 * @uses    in_array() 
    48  * @version $Id: db_search.php 10386 2007-05-14 12:13:44Z cybot_tm $ 
     48 * @version $Id: db_search.php 10958 2007-12-04 18:07:16Z lem9 $ 
    4949 * @author  Thomas Chaumeny <chaume92 at aol.com> 
    5050 */ 
    … …  
    8282    '4' => $GLOBALS['strSearchOption4'], 
    8383); 
    84  
    85 if (empty($_REQUEST['search_str']) || ! is_string($_REQUEST['search_str'])) { 
    86     unset($_REQUEST['submit_search']); 
    87     $searched = ''; 
    88 } else { 
    89     $searched = htmlspecialchars($_REQUEST['search_str']); 
    90     $search_str = PMA_sqlAddslashes($_REQUEST['search_str'], true); 
    91 } 
    9284 
    9385if (empty($_REQUEST['search_option']) || ! is_string($_REQUEST['search_option']) 
    … …  
    9890    $search_option = (int) $_REQUEST['search_option']; 
    9991    $option_str = $search_options[$_REQUEST['search_option']]; 
     92} 
     93 
     94if (empty($_REQUEST['search_str']) || ! is_string($_REQUEST['search_str'])) { 
     95    unset($_REQUEST['submit_search']); 
     96    $searched = ''; 
     97} else { 
     98    $searched = htmlspecialchars($_REQUEST['search_str']); 
     99    // For "as regular expression" (search option 4), we should not treat 
     100    // this as an expression that contains a LIKE (second parameter of 
     101    // PMA_sqlAddslashes()). 
     102    //  
     103    // Usage example: If user is seaching for a literal $ in a regexp search, 
     104    // he should enter \$ as the value. 
     105    $search_str = PMA_sqlAddslashes($_REQUEST['search_str'], ($search_option == 4 ? false : true)); 
    100106} 
    101107 
    … …  
    220226        $sql['select_count']  = $sqlstr_select . ' COUNT(*) AS `count`' . $sqlstr_from . $sqlstr_where; 
    221227        $sql['delete']        = $sqlstr_delete . $sqlstr_from . $sqlstr_where; 
    222  
    223228        return $sql; 
    224229    } // end of the "PMA_getSearchSqls()" function 

  • trunk/gui/tools/pma/db_sql.php

    r774 r966  
    33/** 
    44 * 
    5  * @version $Id: db_sql.php 10240 2007-04-01 11:02:46Z cybot_tm $ 
     5 * @version $Id: db_sql.php 10965 2007-12-05 17:53:52Z lem9 $ 
    66 */ 
    77 
    … …  
    1616require './libraries/db_common.inc.php'; 
    1717require_once './libraries/sql_query_form.lib.php'; 
     18 
     19// The Back link after a syntax error will return to this script 
     20// with the typed query in the textarea. 
     21$goto = 'db_sql.php'; 
     22$back = 'db_sql.php'; 
    1823 
    1924/** 

  • trunk/gui/tools/pma/js/functions.js

    r774 r966  
    33 * general function, usally for data manipulation pages 
    44 * 
    5  * @version $Id: functions.js 10303 2007-04-19 16:58:55Z lem9 $ 
     5 * @version $Id: functions.js 10964 2007-12-05 17:01:48Z lem9 $ 
    66 */ 
    77 
    … …  
    160160        // beginning of expression 
    161161 
    162         var do_confirm_re_0 = new RegExp('^DROP\\s+(IF EXISTS\\s+)?(TABLE|DATABASE)\\s', 'i'); 
    163         var do_confirm_re_1 = new RegExp('^ALTER\\s+TABLE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+DROP\\s', 'i'); 
    164         var do_confirm_re_2 = new RegExp('^DELETE\\s+FROM\\s', 'i'); 
     162        var do_confirm_re_0 = new RegExp('^\\s*DROP\\s+(IF EXISTS\\s+)?(TABLE|DATABASE|PROCEDURE)\\s', 'i'); 
     163        var do_confirm_re_1 = new RegExp('^\\s*ALTER\\s+TABLE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+DROP\\s', 'i'); 
     164        var do_confirm_re_2 = new RegExp('^\\s*DELETE\\s+FROM\\s', 'i'); 
    165165        if (do_confirm_re_0.test(sqlQuery1.value) 
    166166            || do_confirm_re_1.test(sqlQuery1.value) 

  • trunk/gui/tools/pma/lang/english-utf-8.inc.php

    r774 r966  
    11<?php 
    2 /* $Id: english-utf-8.inc.php 10468 2007-06-27 21:01:13Z lem9 $ */ 
     2/* $Id: english-utf-8.inc.php 11023 2007-12-29 15:01:14Z lem9 $ */ 
    33 
    44$charset = 'utf-8'; 
    … …  
    5252$strAll = 'All'; 
    5353$strAllowInterrupt = 'Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.'; 
    54 $strAllTableSameWidth = 'display all tables with same width?'; 
     54$strAllTableSameWidth = 'Display all tables with the same width'; 
    5555$strAlterOrderBy = 'Alter table order by'; 
    5656$strAnalyzeTable = 'Analyze table'; 

  • trunk/gui/tools/pma/libraries/Config.class.php

    r942 r966  
    44 * 
    55 * 
    6  * @version $Id: Config.class.php 10967 2007-12-08 12:46:36Z lem9 $ 
     6 * @version $Id: Config.class.php 11046 2008-01-12 12:18:49Z lem9 $ 
    77 */ 
    88 
    … …  
    8686    function checkSystem() 
    8787    { 
    88         $this->set('PMA_VERSION', '2.11.3'); 
     88        $this->set('PMA_VERSION', '2.11.4'); 
    8989        /** 
    9090         * @deprecated 
    … …  
    543543     * @return  int  Unix timestamp 
    544544     */ 
    545     function getMtime() 
    546     { 
    547         return intval($_SESSION['PMA_Config']->get('fontsize')) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info); 
     545    function getThemeUniqueValue() 
     546    { 
     547        return intval($_SESSION['PMA_Config']->get('fontsize')) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info); 
    548548    } 
    549549 
    … …  
    862862            if (PMA_getenv('PATH_INFO')) { 
    863863                $url = PMA_getenv('PATH_INFO'); 
     864            // on IIS with PHP-CGI: 
     865            } elseif (PMA_getenv('SCRIPT_NAME')) { 
     866                $url = PMA_getenv('SCRIPT_NAME'); 
    864867            } elseif (PMA_getenv('PHP_SELF')) { 
    865868                // PHP_SELF in CGI often points to cgi executable, so use it 
    866869                // as last choice 
    867870                $url = PMA_getenv('PHP_SELF'); 
    868             } elseif (PMA_getenv('SCRIPT_NAME')) { 
    869                 $url = PMA_getenv('PHP_SELF'); 
    870871            } 
    871872        } 
    872873 
    873874        $parsed_url = @parse_url($_SERVER['REQUEST_URI']); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/' 
    874         if ($parsed_url === false) { 
     875        if ($parsed_url === false || empty($parsed_url['path'])) { 
    875876            $parsed_url = array('path' => $url); 
    876877        } 

  • trunk/gui/tools/pma/libraries/Theme.class.php

    r774 r966  
    44 * hold PMA_Theme class 
    55 * 
    6  * @version $Id: Theme.class.php 10137 2007-03-19 17:55:39Z cybot_tm $ 
     6 * @version $Id: Theme.class.php 11035 2008-01-05 13:33:05Z lem9 $ 
    77 */ 
    88 
    … …  
    1010 * handles theme 
    1111 * 
    12  * @todo add the possibility to make a theme depends on another theme and by default on orignal 
    13  * @todo make all components optional - taking missing compnents from 'parent' theme 
    14  * @todo make css optionaly replacing 'parent' css or extending it (by appending at the end) 
     12 * @todo add the possibility to make a theme depends on another theme and by default on original 
     13 * @todo make all components optional - taking missing components from 'parent' theme 
     14 * @todo make css optionally replacing 'parent' css or extending it (by appending at the end) 
    1515 * @todo add an optional global css file - which will be used for both frames 
    1616 * 
    … …  
    6060 
    6161    /** 
     62     * needed because sometimes, the mtime for different themes 
     63     * is identical 
     64     * @var integer filesize for info file 
     65     * @access  protected 
     66     */ 
     67    var $filesize_info = 0; 
     68 
     69    /** 
    6270     * @access  public 
    6371     * @uses    PMA_Theme::getPath() 
    … …  
    6674     * @uses    PMA_Theme::setName() 
    6775     * @uses    filemtime() 
     76     * @uses    filesize() 
    6877     * @uses    file_exists() 
    6978     * @return  boolean     whether loading them info was successful or not 
    … …  
    8796 
    8897        $this->mtime_info = filemtime($this->getPath() . '/info.inc.php'); 
     98        $this->filesize_info = filesize($this->getPath() . '/info.inc.php'); 
    8999 
    90100        if (isset($theme_full_version)) { 

  • trunk/gui/tools/pma/libraries/auth/cookie.auth.lib.php

    r913 r966  
    66 * Dan Wilson who built this patch for the Debian package. 
    77 * 
    8  * @version $Id: cookie.auth.lib.php 10931 2007-11-20 12:55:14Z lem9 $ 
     8 * @version $Id: cookie.auth.lib.php 11009 2007-12-18 18:13:24Z lem9 $ 
    99 */ 
    1010 
    … …  
    589589        if (PMA_getenv('SCRIPT_NAME')) { 
    590590            $GLOBALS['target'] = basename(PMA_getenv('SCRIPT_NAME')); 
     591            // avoid "missing parameter: field" on re-entry 
     592            if ('tbl_alter.php' == $GLOBALS['target']) { 
     593                $GLOBALS['target'] = 'tbl_structure.php'; 
     594            } 
    591595        } 
    592596    } elseif (PMA_DBI_getError()) { 

  • trunk/gui/tools/pma/libraries/common.inc.php

    r942 r966  
    88 * 
    99 * Order of sections for common.inc.php: 
    10  * 
    11  * the include of libraries/defines_mysql.lib.php must be after the connection 
    12  * to db to get the MySql version 
    13  * 
    14  * the authentication libraries must be before the connection to db 
    15  * 
    16  * ... so the required order is: 
    1710 * 
    1811 * LABEL_variables_init 
    … …  
    2922 * - db connection 
    3023 * - authentication work 
    31  * - load of the libraries/defines_mysql.lib.php library to get the MySQL 
    32  *   release number 
    3324 * 
    34  * @version $Id: common.inc.php 10896 2007-11-02 17:34:58Z lem9 $ 
     25 * @version $Id: common.inc.php 11033 2008-01-01 15:03:50Z lem9 $ 
    3526 */ 
    3627 
    … …  
    857848        $PMA_List_Database = new PMA_List_Database($userlink, $controllink); 
    858849 
     850        /** 
     851         * some resetting has to be done when switching servers 
     852         */ 
     853        if (isset($_SESSION['userconf']['previous_server']) && $_SESSION['userconf']['previous_server'] != $GLOBALS['server']) { 
     854            unset($_SESSION['userconf']['navi_limit_offset']); 
     855        } 
     856        $_SESSION['userconf']['previous_server'] = $GLOBALS['server']; 
     857 
    859858    } // end server connecting 
    860859 

  • trunk/gui/tools/pma/libraries/common.lib.php

    r942 r966  
    44 * Misc functions used all over the scripts. 
    55 * 
    6  * @version $Id: common.lib.php 10941 2007-11-25 12:58:41Z lem9 $ 
     6 * @version $Id: common.lib.php 11024 2007-12-29 20:38:27Z lem9 $ 
    77 */ 
    88 
    … …  
    875875    // Reloads the navigation frame via JavaScript if required 
    876876    if (isset($GLOBALS['reload']) && $GLOBALS['reload']) { 
     877        // one of the reasons for a reload is when a table is dropped 
     878        // in this case, get rid of the table limit offset, otherwise 
     879        // we have a problem when dropping a table on the last page 
     880        // and the offset becomes greater than the total number of tables 
     881        unset($_SESSION['table_limit_offset']); 
    877882        echo "\n"; 
    878883        $reload_url = './navigation.php?' . PMA_generate_common_url($GLOBALS['db'], '', '&'); 
    … …  
    12461251        echo '<form action="sql.php" method="post">' . "\n"; 
    12471252        echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); 
    1248         echo '<input type="hidden" name="sql_query" value="' . $sql_query . '" />' . "\n"; 
     1253        echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n"; 
    12491254        echo '<input type="hidden" name="profiling_form" value="1" />' . "\n"; 
    12501255        echo '<input type="checkbox" name="profiling" id="profiling"' . (isset($_SESSION['profiling']) ? ' checked="checked"' : '') . ' onclick="this.form.submit();" /><label for="profiling">' . $GLOBALS['strProfiling'] . '</label>' . "\n"; 

  • trunk/gui/tools/pma/libraries/database_interface.lib.php

    r891 r966  
    44 * Common Option Constants For DBI Functions 
    55 * 
    6  * @version $Id: database_interface.lib.php 10732 2007-10-06 20:03:52Z lem9 $ 
     6 * @version $Id: database_interface.lib.php 11021 2007-12-27 23:50:45Z lem9 $ 
    77 */ 
    88 
    … …  
    187187/** 
    188188 * returns array of all tables in given db or dbs 
    189  * this function expects unqoted names: 
     189 * this function expects unquoted names: 
    190190 * RIGHT: my_database 
    191191 * WRONG: `my_database` 
    … …  
    213213 * @param   boolean|string  $tbl_is_group   $table is a table group 
    214214 * @param   resource        $link           mysql link 
     215 * @param   integer         $limit_offset   zero-based offset for the count  
     216 * @param   boolean|integer $limit_count    number of tables to return  
    215217 * @return  array           list of tables in given db(s) 
    216218 */ 
    … …  
    218220    $tbl_is_group = false, $link = null, $limit_offset = 0, $limit_count = false) 
    219221{ 
    220     // currently supported for MySQL >= 50002 
    221222    if (true === $limit_count) { 
    222223        $limit_count = $GLOBALS['cfg']['MaxTableList']; 
    … …  
    303304            } 
    304305            $each_tables = PMA_DBI_fetch_result($sql, 'Name', null, $link); 
     306            if ($limit_count) { 
     307                $each_tables = array_slice($each_tables, $limit_offset, $limit_count); 
     308            } 
     309 
    305310<