diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-05 19:17:47 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-05 19:17:47 +0400 |
| commit | 7f1fa1bab02e9b584a358b21fdc121de35a43810 (patch) | |
| tree | 509183ba7113fcbb3512ad9a7866fece671ed639 /navigation.php | |
| parent | ca8a30f7f8406b789489da3997162d0beaa75dba (diff) | |
| parent | efa788d00d4ab546f7ec1b24522087c9cbc13743 (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
js/server_status.js
libraries/database_interface.lib.php
libraries/mysql_charsets.lib.php
Diffstat (limited to 'navigation.php')
| -rw-r--r-- | navigation.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/navigation.php b/navigation.php index 85d646ff87..e6ea93346e 100644 --- a/navigation.php +++ b/navigation.php @@ -105,7 +105,7 @@ require_once './libraries/header_http.inc.php'; <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <?php - echo PMA_includeJS('jquery/jquery-1.6.1.js'); + echo PMA_includeJS('jquery/jquery-1.6.2.js'); echo PMA_includeJS('jquery/jquery-ui-1.8.custom.js'); echo PMA_includeJS('navigation.js'); echo PMA_includeJS('functions.js'); @@ -331,7 +331,8 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { * @param integer $offset * @param integer $count */ -function PMA_displayDbList($ext_dblist, $offset, $count) { +function PMA_displayDbList($ext_dblist, $offset, $count) +{ global $element_counter, $img_minus, $img_plus, $href_left, $db_start, $common_url_query; |