[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-243-g3c75387

[Dieter Adriaenssens]

The branch, master has been updated
       via  3c7538701d361dea1c8ac4c0450bf477e74f3e1f (commit)
       via  c7c77f9744e8bcd5eb27a4df86b2375dff2881ad (commit)
      from  767d16a8fa52a2d9ee30e3ed15b2f83c398bc027 (commit)


- Log -----------------------------------------------------------------
commit 3c7538701d361dea1c8ac4c0450bf477e74f3e1f
Merge: c7c77f9744e8bcd5eb27a4df86b2375dff2881ad 767d16a8fa52a2d9ee30e3ed15b2f83c398bc027
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date:   Wed Mar 17 23:05:13 2010 +0100

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit c7c77f9744e8bcd5eb27a4df86b2375dff2881ad
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date:   Wed Mar 17 22:50:27 2010 +0100

    fix mistake in merge

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

Summary of changes:
 tbl_change.php |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/tbl_change.php b/tbl_change.php
index fae0455..0c89a17 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -462,11 +462,7 @@ foreach ($rows as $row_id => $vrow) {
                 . htmlspecialchars($vrow[$field['Field']]) . '" />';
         } else {
             // (we are inserting)
-<<<<<<< HEAD
             // display default values
-=======
-            // loic1: display default values
->>>>>>> QA_3_3
             if (!isset($field['Default'])) {
                 $field['Default'] = '';
                 $real_null_value          = TRUE;
@@ -482,11 +478,7 @@ foreach ($rows as $row_id => $vrow) {
             $backup_field  = '';
             $special_chars_encoded = PMA_duplicateFirstNewline($special_chars);
             // this will select the UNHEX function while inserting
-<<<<<<< HEAD
             if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && ! $cfg['ProtectBinary']) {
-=======
-            if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
->>>>>>> QA_3_3
                 $field['display_binary_as_hex'] = true;
             }
         }


hooks/post-receive
-- 
phpMyAdmin