The branch, master has been updated via 27a56224ff4a059593fb3c50a8385a7ee4027179 (commit) via 142b1e2183660d25cb4827c56f8760f4cb66e714 (commit) via e2aaeaf1d621f5dd0ae4d97af383f8afe5b1ba73 (commit) via 13cb9e7e3e18208962f50e751891af3bcde3ec00 (commit) via b90805f7eb266967480295c02c9eb94680c4f7fb (commit) via 7b831bc8777c3f8195d33f3e7720d8123f3d9ce2 (commit) via e5ab5e637e6e09dec98a4ec7656818b2c71b022c (commit) via f0672d82c38af1593523e2271f4cadcd27e64e39 (commit) via 3e5c8f9f01042c42f6a656e06fd2bc61fe5786a5 (commit) from 8b221f354b54b0c282b96128acc6da5862b02668 (commit)

- Log ----------------------------------------------------------------- commit 27a56224ff4a059593fb3c50a8385a7ee4027179 Merge: 8b221f354b54b0c282b96128acc6da5862b02668 142b1e2183660d25cb4827c56f8760f4cb66e714 Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: Wed Mar 17 22:14:47 2010 +0100

Merge branch 'QA_3_3'

Conflicts: ChangeLog tbl_change.php

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

Summary of changes: ChangeLog | 2 ++ main.php | 4 ++-- tbl_addfield.php | 2 +- tbl_change.php | 8 ++++++++ 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog index bd423eb..b20e630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2967366 [Structure] Some results of Propose table structure are shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY +- [navi] Changed link to git repository on main page

3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly @@ -69,6 +70,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Dieter Adriaenssens - ruleant - bug #2961198 [parser] Querying a table named "data" - bug #2931429 [structure] Editing long triggers +- bug #2970769 [structure] Incorrect reference to mootools-more.js

3.3.0.0 (2010-03-07) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/main.php b/main.php index 7f6ba61..ef9c6b5 100644 --- a/main.php +++ b/main.php @@ -239,8 +239,8 @@ PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmi ?> <li><bdo xml:lang="en" dir="ltr"> [<a href="changelog.php" target="_blank">ChangeLog</a>] - [<a href="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/" - target="_blank">Subversion</a>] + [<a href="http://phpmyadmin.git.sourceforge.net/git/gitweb-index.cgi" + target="_blank">Git</a>] [<a href="http://sourceforge.net/mail/?group_id=23067" target="_blank">Lists</a>] </bdo> diff --git a/tbl_addfield.php b/tbl_addfield.php index 886b939..cfa25f5 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -13,7 +13,7 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php';

$GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'mootools-more.js'; +$GLOBALS['js_include'][] = 'mootools.js'; require_once './libraries/header.inc.php';

// Check parameters diff --git a/tbl_change.php b/tbl_change.php index 0c89a17..fae0455 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -462,7 +462,11 @@ 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; @@ -478,7 +482,11 @@ 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