From fcb4986598223d6aa61bc2d1d6c6215bf9fdfda5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 4 Aug 2011 01:50:04 +0200 Subject: [PATCH] there is no create_time-status for views Signed-off-by: Sven Strickroth --- libraries/Table.class.php | 6 +++--- libraries/display_tbl.lib.php | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 090d4a88d6..80ab72778a 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1338,7 +1338,7 @@ class PMA_Table } } else if ($property == self::PROP_COLUMN_ORDER || $property == self::PROP_COLUMN_VISIB) { - if (isset($this->uiprefs[$property])) { + if (! PMA_Table::isView($this->db_name, $this->name) && isset($this->uiprefs[$property])) { // check if the table has not been modified if (self::sGetStatusInfo($this->db_name, $this->name, 'Create_time') == $this->uiprefs['CREATE_TIME']) { @@ -1376,8 +1376,8 @@ class PMA_Table $this->loadUiPrefs(); } // we want to save the create time if the property is PROP_COLUMN_ORDER - if ($property == self::PROP_COLUMN_ORDER || - $property == self::PROP_COLUMN_VISIB) { + if (! PMA_Table::isView($this->db_name, $this->name) && ($property == self::PROP_COLUMN_ORDER || + $property == self::PROP_COLUMN_VISIB)) { $curr_create_time = self::sGetStatusInfo($this->db_name, $this->name, 'CREATE_TIME'); if (isset($table_create_time) && diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 797a3eb3a8..19a1749d01 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -414,8 +414,10 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di echo ''; } // generate table create time - echo ''; + if (! PMA_Table::isView($GLOBALS['table'], $GLOBALS['db'])) { + echo ''; + } } // generate hints echo ''; -- 2.11.4.GIT