[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25816-g1f85d95

[Michal Čihař]

The branch, master has been updated
       via  1f85d957ca8d6fc0df61be364c806218ba90ef7a (commit)
      from  35d5d344302439495fbd457f1f3ec6cc25edbcef (commit)


- Log -----------------------------------------------------------------
commit 1f85d957ca8d6fc0df61be364c806218ba90ef7a
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Thu Jan 5 18:35:43 2012 +0900

    Improved the Structure table of the snapshot

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

Summary of changes:
 tbl_tracking.php |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tbl_tracking.php b/tbl_tracking.php
index fecfa86..3f14745 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -278,8 +278,23 @@ if (isset($_REQUEST['snapshot'])) {
             ?>
             <td><?php echo htmlspecialchars($field['Type']);?></td>
             <td><?php echo htmlspecialchars($field['Collation']);?></td>
-            <td><?php echo htmlspecialchars($field['Null']);?></td>
-            <td><?php echo htmlspecialchars($field['Default']);?></td>
+            <td><?php echo (($field['Null'] == 'YES') ? __('Yes') : __('No')); ?></td>
+            <td><?php
+            if (isset($field['Default'])) {
+                $extracted_fieldspec = PMA_extractFieldSpec($field['Type']);
+                if ($extracted_fieldspec['type'] == 'bit') {
+                    // here, $field['Default'] contains something like b'010'
+                    echo PMA_convert_bit_default_value($field['Default']);
+                } else {
+                    echo htmlspecialchars($field['Default']);
+                }
+            } else {
+                if ($field['Null'] == 'YES') {
+                    echo '<i>NULL</i>';
+                } else {
+                    echo '<i>' . _pgettext('None for default', 'None') . '</i>';
+                }
+            } ?></td>
             <td><?php echo htmlspecialchars($field['Extra']);?></td>
             <td><?php echo htmlspecialchars($field['Comment']);?></td>
         </tr>


hooks/post-receive
-- 
phpMyAdmin