Git April 2010

git@phpmyadmin.net

6 participants
240 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2091-gd6fa1d8
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via d6fa1d8595b3a1f2d0a5f5ea933d6e6fd96ceb9d (commit) from 382ce6e7add4d92ce5809fe15f5bb659fadd33a3 (commit) - Log ----------------------------------------------------------------- commit d6fa1d8595b3a1f2d0a5f5ea933d6e6fd96ceb9d Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:02:30 2010 +0200 Add docblock, whitespace leanup. ----------------------------------------------------------------------- Summary of changes: db_tracking.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/db_tracking.php b/db_tracking.php index c2dde64..46f2544 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -5,7 +5,9 @@ * @package phpMyAdmin */ -// Run common work +/** + * Run common work + */ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; @@ -95,7 +97,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { $table_query = ' SELECT * FROM ' . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - ' WHERE `db_name` = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' AND `table_name` = \'' . PMA_sqlAddslashes($table_name) . '\' AND `version` = \'' . $version_number . '\''; + ' WHERE `db_name` = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' AND `table_name` = \'' . PMA_sqlAddslashes($table_name) . '\' AND `version` = \'' . $version_number . '\''; $table_result = PMA_query_as_controluser($table_query); $version_data = PMA_DBI_fetch_array($table_result); @@ -122,7 +124,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { </tr> <?php if ($style == 'even') { - $style = 'odd'; + $style = 'odd'; } else { $style = 'even'; } @@ -177,7 +179,7 @@ if (isset($my_tables)) { </tr> <?php if ($style == 'even') { - $style = 'odd'; + $style = 'odd'; } else { $style = 'even'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2090-g382ce6e
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via 382ce6e7add4d92ce5809fe15f5bb659fadd33a3 (commit) from 407054b6b147b2d877dc73a9f316045f3615172b (commit) - Log ----------------------------------------------------------------- commit 382ce6e7add4d92ce5809fe15f5bb659fadd33a3 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:00:42 2010 +0200 Remove phpdoc here. ----------------------------------------------------------------------- Summary of changes: config.sample.inc.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/config.sample.inc.php b/config.sample.inc.php index 562ba52..575e965 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -132,7 +132,6 @@ $cfg['SaveDir'] = ''; /** * When using DB-based query history, how many entries should be kept? * - * @global integer $cfg['QueryHistoryMax'] * default = 25 */ //$cfg['QueryHistoryMax'] = 100; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2089-g407054b
by Marc Delisle 29 Apr '10

29 Apr '10

The branch, master has been updated via 407054b6b147b2d877dc73a9f316045f3615172b (commit) from 9ec14c786c2a6917c458198c1c256c3d534cbc8d (commit) - Log ----------------------------------------------------------------- commit 407054b6b147b2d877dc73a9f316045f3615172b Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 07:44:30 2010 -0400 I do not see the reason for this condition, and it creates a problem so I remove it ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 3f42c40..79e3b6d 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -458,7 +458,7 @@ foreach ($rows as $row_id => $vrow) { } else { // special binary "characters" if ($field['is_binary'] || $field['is_blob']) { - if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && !$cfg['ProtectBinary']) { + if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { $vrow[$field['Field']] = bin2hex($vrow[$field['Field']]); $field['display_binary_as_hex'] = true; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 238f4997c5dc4ffddb98aad0534fe38867ee3587
by Michal Čihař 29 Apr '10

29 Apr '10

The branch, master has been updated via 238f4997c5dc4ffddb98aad0534fe38867ee3587 (commit) from 9b6695dff4470be94556776c0618ee4d8ff80e20 (commit) - Log ----------------------------------------------------------------- commit 238f4997c5dc4ffddb98aad0534fe38867ee3587 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 10:35:58 2010 +0200 Add link to wiki. ----------------------------------------------------------------------- Summary of changes: templates/improve.tpl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/improve.tpl b/templates/improve.tpl index b39a09f..7a2e353 100644 --- a/templates/improve.tpl +++ b/templates/improve.tpl @@ -103,6 +103,8 @@ Standards should be obeyed in all cases when possible. Generated content should be valid XHTML 1.0 and CSS. PHP code should match <a href="http://pear.php.net/manual/en/standards.php">PEAR Coding Standards</a> and documented using <a href="http://www.phpdoc.org/">phpDocumentator</a>. +More information about coding is available on <a href="http://wiki.phpmyadmin.net/pma/Devel:Coding_guidelines"> +our wiki</a>. </p> <h3>Developer Documentation</h3> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. f5508e4ced647d64233e01fd00f78459be50fa91
by Marc Delisle 28 Apr '10

28 Apr '10

The branch, master has been updated via f5508e4ced647d64233e01fd00f78459be50fa91 (commit) from 45583f3f23ef548f2c8363df8421e5ffe5ff2c30 (commit) - Log ----------------------------------------------------------------- commit f5508e4ced647d64233e01fd00f78459be50fa91 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Apr 28 16:07:09 2010 -0400 Adnan Mughal ----------------------------------------------------------------------- Summary of changes: planet.ini | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/planet.ini b/planet.ini index 0282c87..86089bb 100644 --- a/planet.ini +++ b/planet.ini @@ -36,3 +36,6 @@ name = Martynas Mickevičius [http://lorilee1.wordpress.com/feed/] name = Lori Lee + +[http://www.imblog.info/feed/] +name = Adnan Mughal hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 45583f3f23ef548f2c8363df8421e5ffe5ff2c30
by Michal Čihař 28 Apr '10

28 Apr '10

The branch, master has been updated via 45583f3f23ef548f2c8363df8421e5ffe5ff2c30 (commit) from 66190d352cd504592b485f3540c163293a2a5341 (commit) - Log ----------------------------------------------------------------- commit 45583f3f23ef548f2c8363df8421e5ffe5ff2c30 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Apr 28 20:44:21 2010 +0200 Add Lori Lee. ----------------------------------------------------------------------- Summary of changes: planet.ini | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/planet.ini b/planet.ini index d8b8608..0282c87 100644 --- a/planet.ini +++ b/planet.ini @@ -33,3 +33,6 @@ name = Ninad Pundalik [http://blog.2m.lt/feeds/posts/default] name = Martynas Mickevičius + +[http://lorilee1.wordpress.com/feed/] +name = Lori Lee hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2088-g9ec14c7
by Marc Delisle 28 Apr '10

28 Apr '10

The branch, master has been updated via 9ec14c786c2a6917c458198c1c256c3d534cbc8d (commit) via b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit) from ba0ca1851a2605c17f23bd850b5c1575a11f83bb (commit) - Log ----------------------------------------------------------------- commit 9ec14c786c2a6917c458198c1c256c3d534cbc8d Merge: ba0ca1851a2605c17f23bd850b5c1575a11f83bb b76df0d6099704dad6414d4fe4aaccb6694b61a5 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Apr 28 13:15:49 2010 -0400 Avoid selecting UNHEX function by default for a BLOB column for which editing is protected ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ tbl_change.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0866d4..cc81a36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,8 @@ $Id$ - bug #2983065 [operations] Error when changing from Maria to MyISAM engine - bug #2975408 [tracking] Data too long for column data_sql - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL +- bug [edit] Avoid selecting UNHEX function by default for a BLOB column for + which editing is protected 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_change.php b/tbl_change.php index 57b8912..3f42c40 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -497,7 +497,7 @@ 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'] && ! $cfg['ProtectBinary']) { + if (($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { $field['display_binary_as_hex'] = true; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-27-gb76df0d
by Marc Delisle 28 Apr '10

28 Apr '10

The branch, QA_3_3 has been updated via b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit) from 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit) - Log ----------------------------------------------------------------- commit b76df0d6099704dad6414d4fe4aaccb6694b61a5 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Apr 28 13:06:09 2010 -0400 Avoid selecting UNHEX function by default for a BLOB column for which editing is protected ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ tbl_change.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46a7f1c..e5064bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2983065 [operations] Error when changing from Maria to MyISAM engine - bug #2975408 [tracking] Data too long for column data_sql - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL +- bug [edit] Avoid selecting UNHEX function by default for a BLOB column for + which editing is protected 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_change.php b/tbl_change.php index f8cc1c0..d7b86dd 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -482,7 +482,7 @@ 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']) { + if (($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { $field['display_binary_as_hex'] = true; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 66190d352cd504592b485f3540c163293a2a5341
by Michal Čihař 28 Apr '10

28 Apr '10

The branch, master has been updated via 66190d352cd504592b485f3540c163293a2a5341 (commit) from e6fd920da32db4aa2e6883cb5d6e2ccd80fa1a98 (commit) - Log ----------------------------------------------------------------- commit 66190d352cd504592b485f3540c163293a2a5341 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Apr 28 13:15:48 2010 +0200 Fix the url. ----------------------------------------------------------------------- Summary of changes: planet.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/planet.ini b/planet.ini index 90378a1..d8b8608 100644 --- a/planet.ini +++ b/planet.ini @@ -28,7 +28,7 @@ name = Michal Čihař [http://ankitgupt.wordpress.com/feed/] name = Ankit Gupta -[http://ninadpundalik.co.cc/blog/feed] +[http://ninadpundalik.co.cc/blog/feed/] name = Ninad Pundalik [http://blog.2m.lt/feeds/posts/default] hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. e6fd920da32db4aa2e6883cb5d6e2ccd80fa1a98
by Marc Delisle 28 Apr '10

28 Apr '10

The branch, master has been updated via e6fd920da32db4aa2e6883cb5d6e2ccd80fa1a98 (commit) from 4c0c051ac4d159a02fdba405fdafce4a6bb7ff66 (commit) - Log ----------------------------------------------------------------- commit e6fd920da32db4aa2e6883cb5d6e2ccd80fa1a98 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Apr 27 18:43:26 2010 -0400 Martynas blog feed ----------------------------------------------------------------------- Summary of changes: planet.ini | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/planet.ini b/planet.ini index da75c87..90378a1 100644 --- a/planet.ini +++ b/planet.ini @@ -31,3 +31,5 @@ name = Ankit Gupta [http://ninadpundalik.co.cc/blog/feed] name = Ninad Pundalik +[http://blog.2m.lt/feeds/posts/default] +name = Martynas Mickevičius hooks/post-receive -- Planet phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git April 2010