The branch, master has been updated
via e3a3e26146c5856f1593656aefe73de7a6da683d (commit)
via 4db9c176b3be2325a7b824de8c2409fc4390640d (commit)
from 9b2570b0cfa73860fd150d741535991308b5b199 (commit)
- Log -----------------------------------------------------------------
commit e3a3e26146c5856f1593656aefe73de7a6da683d
Merge: 4db9c17 9b2570b
Author: Madhura Jayaratne <[email protected]>
Date: Sat Aug 20 07:22:16 2011 +0530
Merge branch 'master' of
ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 4db9c176b3be2325a7b824de8c2409fc4390640d
Author: Madhura Jayaratne <[email protected]>
Date: Sat Aug 20 07:19:17 2011 +0530
bug #3385954 - unknown table status:Create_time on dispalying view (again)
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index ddcfb7a..e7488ff 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -578,8 +578,10 @@ function PMA_displayTableHeaders(&$is_display,
&$fields_meta, $fields_cnt = 0, $
echo '<input id="col_visib" type="hidden" value="' . implode(',',
$col_visib) . '" />';
}
// generate table create time
- echo '<input id="table_create_time" type="hidden" value="' .
- PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'],
'Create_time') . '" />';
+ if (! PMA_Table::isView($GLOBALS['table'], $GLOBALS['db'])) {
+ echo '<input id="table_create_time" type="hidden" value="' .
+ PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'],
'Create_time') . '" />';
+ }
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
