[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13281-g275637d

[Madhura Jayaratne]

The branch, master has been updated
       via  275637daa25a94e8e29f07137403a7a17aac9b1d (commit)
       via  fcb4986598223d6aa61bc2d1d6c6215bf9fdfda5 (commit)
       via  ed45a8e1f5502995c219144d4dbbb2b276aec28d (commit)
      from  a11a782cb6a387a9defb380887844ccd7bcbe96b (commit)


- Log -----------------------------------------------------------------
commit 275637daa25a94e8e29f07137403a7a17aac9b1d
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun Aug 7 18:33:13 2011 +0530

    ChangeLog entry for patch #3385954

commit fcb4986598223d6aa61bc2d1d6c6215bf9fdfda5
Author: Sven Strickroth <email at cs-ware.de>
Date:   Thu Aug 4 01:50:04 2011 +0200

    there is no create_time-status for views
    
    Signed-off-by: Sven Strickroth <email at cs-ware.de>

commit ed45a8e1f5502995c219144d4dbbb2b276aec28d
Author: Sven Strickroth <email at cs-ware.de>
Date:   Thu Aug 4 01:31:30 2011 +0200

    use i10n for error message
    
    Signed-off-by: Sven Strickroth <email at cs-ware.de>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |    1 +
 libraries/Table.class.php     |    8 ++++----
 libraries/display_tbl.lib.php |    6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca7feb5..6bc67e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@ phpMyAdmin - ChangeLog
 - bug #3374802 [interface] Comment on a column breaks inline editing
 - bug #3383711 [display] Order by a column in a view doesn't work in some cases
 - bug #3386434 [interface] Add missing space to server status
+- patch #3385954 [interface] "Unknown table status: Create_time" on dispalying view
 
 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index d2a0dbe..80ab727 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -300,7 +300,7 @@ class PMA_Table
 
         if (! isset(PMA_Table::$cache[$db][$table][$info])) {
             if (! $disable_error) {
-                trigger_error('unknown table status: ' . $info, E_USER_WARNING);
+                trigger_error(__('unknown table status: ') . $info, E_USER_WARNING);
             }
             return false;
         }
@@ -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 797a3eb..19a1749 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 '<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') . '" />';
+            }
         }
         // generate hints
         echo '<input id="col_order_hint" type="hidden" value="' . __('Drag to reorder') . '" />';


hooks/post-receive
-- 
phpMyAdmin