[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16947-g1433b4c

[Michal Čihař]

The branch, master has been updated
       via  1433b4c3319a58c05e46ed8aca851ef0f8b76266 (commit)
      from  67ebda8d6c311251e12e4c28649f8ee0324286b4 (commit)


- Log -----------------------------------------------------------------
commit 1433b4c3319a58c05e46ed8aca851ef0f8b76266
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Aug 23 11:59:43 2011 +0200

    Fixed and simplified type detection on editing
    
    Fixes bug#3392824 and cleans up the code.

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

Summary of changes:
 libraries/tbl_properties.inc.php |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 3a4bf96..cdc2c55 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -289,21 +289,10 @@ for ($i = 0; $i < $num_fields; $i++) {
         // creating a column
         $row['Type'] = '';
         $type        = '';
+        $length = '';
     } else {
-        $type        = $row['Type'];
-    }
-
-    if (! empty($row['Type'])) {
         $type = $extracted_fieldspec['type'];
-        if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) {
-            $length = $extracted_fieldspec['spec_in_brackets'];
-        } else {
-            $type = $extracted_fieldspec['print_type'];
-            $length = $extracted_fieldspec['spec_in_brackets'];
-        } // end if else
-    } else {
-        // creating a column
-        $length = '';
+        $length = $extracted_fieldspec['spec_in_brackets'];
     }
 
     // some types, for example longtext, are reported as


hooks/post-receive
-- 
phpMyAdmin