From 3e5c8f9f01042c42f6a656e06fd2bc61fe5786a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 11 Mar 2010 17:04:31 +0100 Subject: [PATCH 01/13] Add list of ignored files. --- .gitignore | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..83fc036dd --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# Directory for creating releases +release +# Configuration files +config.inc.php +config.header.inc.php +config.footer.inc.php +# Upload/save dirs +upload +save +# For setup script +config +# ctags +tags +# Editor files +phpmyadmin.wpj +.projectOptions +.vimrc +.project +.settings +.buildpath +.cache +*.sw[op] From f0672d82c38af1593523e2271f4cadcd27e64e39 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 15 Mar 2010 16:08:56 -0400 Subject: [PATCH 02/13] bug #2967565 UNHEX not selected by default when inserting BINARY --- ChangeLog | 1 + tbl_change.php | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9514bd826..1594d49fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing - bug #2967366 [Structure] Some results of Propose table structure are shown in hex +- bug #2967565 [insert] UNHEX not selected by default when inserting BINARY 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/tbl_change.php b/tbl_change.php index c2fb93aa9..f8cc1c0cf 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -429,6 +429,7 @@ foreach ($rows as $row_id => $vrow) { $real_null_value = FALSE; $special_chars_encoded = ''; if (isset($vrow)) { + // (we are editing) // On a BLOB that can have a NULL value, the is_null() returns // true if it has no content but for me this is different than // having been set explicitely to NULL so I put an exception here @@ -464,6 +465,7 @@ foreach ($rows as $row_id => $vrow) { . $field_name_appendix . '" value="' . htmlspecialchars($vrow[$field['Field']]) . '" />'; } else { + // (we are inserting) // loic1: display default values if (!isset($field['Default'])) { $field['Default'] = ''; @@ -479,6 +481,10 @@ foreach ($rows as $row_id => $vrow) { } $backup_field = ''; $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); + // this will select the UNHEX function while inserting + if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { + $field['display_binary_as_hex'] = true; + } } $idindex = ($o_rows * $fields_cnt) + $i + 1; From e5ab5e637e6e09dec98a4ec7656818b2c71b022c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 15 Mar 2010 16:36:19 -0400 Subject: [PATCH 03/13] bug #2970769 Incorrect reference to mootools-more.js --- ChangeLog | 1 + tbl_addfield.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b40f514c..c70051083 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,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/tbl_addfield.php b/tbl_addfield.php index 886b93938..cfa25f549 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 From b90805f7eb266967480295c02c9eb94680c4f7fb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 16 Mar 2010 07:54:17 -0400 Subject: [PATCH 04/13] 3.3.1 release --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f16bfb757..01c698535 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY -3.3.1.0 (not yet released) +3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly - bug #2948492 [interface] Slide effect masks some fields on search page - bug #2959746 [interface] Unknown table status: TABLE_TYPE From b7bbb967baa622cc2a586609b56aaba356898a19 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 16 Mar 2010 08:10:49 -0400 Subject: [PATCH 05/13] no branch exist in the cloned directory; advice for changes before validation --- scripts/create-release.sh | 65 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 269ef4461..9e5b0a166 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -35,37 +35,6 @@ shift branch=$1 shift -# Create working copy -mkdir -p release -workdir=release/phpMyAdmin-$version -if [ -d $workdir ] ; then - echo "Working directory '$workdir' already exists, please move it out of way" - exit 1 -fi -git clone --local . $workdir -cd $workdir - -# Checkout branch -git checkout $branch - -# Check release version -if ! grep -q "'PMA_VERSION', '$version'" libraries/Config.class.php ; then - echo "There seems to be wrong version in libraries/Config.class.php!" - exit 2 -fi -if ! grep -q "phpMyAdmin $version - Documentation" Documentation.html ; then - echo "There seems to be wrong version in Documentation.html" - exit 2 -fi -if ! grep -q "phpMyAdmin $version - Official translators" translators.html ; then - echo "There seems to be wrong version in translators.html" - exit 2 -fi -if ! grep -q "Version $version\$" README ; then - echo "There seems to be wrong version in README" - exit 2 -fi - cat < RELEASE-DATE-${version} @@ -203,8 +202,8 @@ cat < Date: Tue, 16 Mar 2010 12:38:56 -0400 Subject: [PATCH 06/13] typos --- Documentation.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index 30537f01d..6656c0e8c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1103,7 +1103,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_view'] boolean
- Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. Default value is true. + Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. Default value is true.

@@ -1112,7 +1112,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_table'] boolean
- Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. Default value is true. + Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. Default value is true.

@@ -1120,7 +1120,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_database'] boolean
- Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. Default value is true. + Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. Default value is true.

From 8bf35a0e146d249192b87691d883ab8912f3276e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 16 Mar 2010 12:42:56 -0400 Subject: [PATCH 07/13] typos --- Documentation.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index bb1c27d96..4c5157dde 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1115,7 +1115,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_view'] boolean
- Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. Default value is true. + Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. Default value is true.

@@ -1124,7 +1124,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_table'] boolean
- Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. Default value is true. + Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. Default value is true.

@@ -1132,7 +1132,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_database'] boolean
- Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. Default value is true. + Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. Default value is true.

From e2aaeaf1d621f5dd0ae4d97af383f8afe5b1ba73 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 16 Mar 2010 12:47:42 -0400 Subject: [PATCH 08/13] typos --- libraries/config.default.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 3450739ed..b1fef17ab 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -439,7 +439,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE'; /** - * Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. + * Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_view'] */ @@ -447,7 +447,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D $cfg['Servers'][$i]['tracking_add_drop_view'] = true; /** - * Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. + * Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_table'] */ @@ -455,7 +455,7 @@ $cfg['Servers'][$i]['tracking_add_drop_view'] = true; $cfg['Servers'][$i]['tracking_add_drop_table'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_database'] */ @@ -463,7 +463,7 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true; $cfg['Servers'][$i]['tracking_add_drop_database'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_version_drop_database'] */ From 8b221f354b54b0c282b96128acc6da5862b02668 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 16 Mar 2010 12:49:07 -0400 Subject: [PATCH 09/13] typos --- libraries/config.default.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 3f56bd1d4..653fc53a1 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -446,7 +446,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE'; /** - * Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. + * Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_view'] */ @@ -454,7 +454,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D $cfg['Servers'][$i]['tracking_add_drop_view'] = true; /** - * Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. + * Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_table'] */ @@ -462,7 +462,7 @@ $cfg['Servers'][$i]['tracking_add_drop_view'] = true; $cfg['Servers'][$i]['tracking_add_drop_table'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_database'] */ @@ -470,7 +470,7 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true; $cfg['Servers'][$i]['tracking_add_drop_database'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_version_drop_database'] */ From 142b1e2183660d25cb4827c56f8760f4cb66e714 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Wed, 17 Mar 2010 19:52:11 +0100 Subject: [PATCH 10/13] Changed link to git repository on main page --- ChangeLog | 1 + main.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01c698535..cfa265d56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,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 diff --git a/main.php b/main.php index bad9b9e29..4bb6a756c 100644 --- a/main.php +++ b/main.php @@ -239,8 +239,8 @@ PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmi ?>
  • [ChangeLog] - [Subversion] + [Git] [Lists] From 767d16a8fa52a2d9ee30e3ed15b2f83c398bc027 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 17 Mar 2010 17:50:23 -0400 Subject: [PATCH 11/13] bug #2972232 Import menu tab not present on main page --- ChangeLog | 1 + libraries/server_links.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b20e63041..ab7277ca6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY - [navi] Changed link to git repository on main page +- bug #2972232 [menu] Import menu tab not present on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1366baa7b..40479d2c4 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -87,9 +87,9 @@ $tabs['import']['icon'] = 'b_import.png'; $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = $strImport; -$tabs['import']['icon'] = 's_sync.png'; -$tabs['import']['link'] = 'server_synchronize.php'; -$tabs['import']['text'] = $strSynchronize; +$tabs['synchronize']['icon'] = 's_sync.png'; +$tabs['synchronize']['link'] = 'server_synchronize.php'; +$tabs['synchronize']['text'] = $strSynchronize; echo PMA_generate_html_tabs($tabs, array()); unset($tabs); From c7c77f9744e8bcd5eb27a4df86b2375dff2881ad Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Wed, 17 Mar 2010 22:50:27 +0100 Subject: [PATCH 12/13] fix mistake in merge --- tbl_change.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index fae0455e4..0c89a173e 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; } } From 7e77192187443d78a7de5ccdec174520608a661a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 18 Mar 2010 13:02:13 -0400 Subject: [PATCH 13/13] rfe 2958013 After import, also list uploaded filename --- ChangeLog | 2 ++ import.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index ab7277ca6..f9ec21d78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Turkish update, thanks to Burak Yavuz + rfe #2963310 [interface] Focus TEXTAREA "sql_query" on click on "SQL" link + [lang] Uzbek update, thanks to Orzu Samarqandiy ++ rfe #2958013 [import] After import, also list uploaded filename, thanks + to Pavel Konnikov and Herman van Rink 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/import.php b/import.php index 7aa6088fb..7f06ceb74 100644 --- a/import.php +++ b/import.php @@ -411,9 +411,11 @@ if (!empty($id_bookmark) && $action_bookmark == 2) { $message->addParam($executed_queries); $message->addString($import_notice); + $message->addString('(' . $_FILES['import_file']['name'] . ')'); } else { $message = PMA_Message::success('strImportSuccessfullyFinished'); $message->addParam($executed_queries); + $message->addString('(' . $_FILES['import_file']['name'] . ')'); } } }