The branch, master has been updated
via 60f85e193449f02cb81550be8dc3476d0b04e812 (commit)
from aef93ba59230af6932cbdfea83a1f60d56676794 (commit)
- Log -----------------------------------------------------------------
commit 60f85e193449f02cb81550be8dc3476d0b04e812
Author: Marc Delisle <[email protected]>
Date: Fri Feb 18 12:55:51 2011 -0500
Improve full mode navi display when CountTables is false
-----------------------------------------------------------------------
Summary of changes:
navigation.php | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/navigation.php b/navigation.php
index ef191fe..381b561 100644
--- a/navigation.php
+++ b/navigation.php
@@ -423,18 +423,23 @@ function PMA_displayDbList($ext_dblist, $offset, $count) {
. '?' . $common_url_query; ?>', 'main');
return false;">
<?php
- if ($GLOBALS['text_dir'] === 'rtl') {
- echo ' <bdo dir="ltr">(' . $db['num_tables'] .
')</bdo> ';
+ // Might be unset if CountTables directive is false
+ if (isset($db['num_tables'])) {
+ if ($GLOBALS['text_dir'] === 'rtl') {
+ echo ' <bdo dir="ltr">(' . $db['num_tables'] .
')</bdo> ';
+ }
}
echo htmlspecialchars($db['disp_name']);
- if ($GLOBALS['text_dir'] === 'ltr') {
- echo ' <bdo dir="ltr">(' . $db['num_tables'] .
')</bdo> ';
+ if (isset($db['num_tables'])) {
+ if ($GLOBALS['text_dir'] === 'ltr') {
+ echo ' <bdo dir="ltr">(' . $db['num_tables'] .
')</bdo> ';
+ }
}
?>
</a>
<?php
} else {
- // with only 1 db available we dont need to refresh left frame
+ // with only 1 db available we dont need to refresh navi frame
// on db selection, only phpmain
?>
<a href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
@@ -442,12 +447,16 @@ function PMA_displayDbList($ext_dblist, $offset, $count) {
id="<?php echo htmlspecialchars($db['name']); ?>"
title="<?php echo htmlspecialchars($db['comment']); ?>">
<?php
- if ($GLOBALS['text_dir'] === 'rtl') {
- echo ' <bdo dir="ltr">(' . $db['num_tables'] .
')</bdo> ';
+ if (isset($db['num_tables'])) {
+ if ($GLOBALS['text_dir'] === 'rtl') {
+ echo ' <bdo dir="ltr">(' . $db['num_tables'] .
')</bdo> ';
+ }
}
echo htmlspecialchars($db['disp_name']);
- if ($GLOBALS['text_dir'] === 'ltr') {
- echo ' <bdo dir="ltr">(' . $db['num_tables'] .
')</bdo> ';
+ if (isset($db['num_tables'])) {
+ if ($GLOBALS['text_dir'] === 'ltr') {
+ echo ' <bdo dir="ltr">(' . $db['num_tables'] .
')</bdo> ';
+ }
}
?>
</a>
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
