- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20514-g96bf96d
by Marc Delisle 29 Sep '11

29 Sep '11

The branch, master has been updated via 96bf96d4221811432b4535b5812dbd9cb77f64b8 (commit) via 6c980106b7e49de3d94a2877ec4f23253d21ee0b (commit) from abe93510a28dd5286518d80f6ca9c4bd7c9b7983 (commit) - Log ----------------------------------------------------------------- commit 96bf96d4221811432b4535b5812dbd9cb77f64b8 Merge: abe9351 6c98010 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Sep 29 12:48:03 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_change.php | 2 +- themes/original/css/theme_right.css.php | 4 ++++ themes/pmahomme/css/theme_right.css.php | 3 +++ 4 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 425a6be..5668311 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ phpMyAdmin - ChangeLog - bug #3390832 [display] Delete records from last page breaks search - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken - bug #3414744 [core] External link fails in 3.4.5 +- patch #3314626 [display] CharTextareaRows is not respected 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/tbl_change.php b/tbl_change.php index b64da6e..774d711 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -925,7 +925,7 @@ foreach ($rows as $row_id => $vrow) { ) { echo "\n"; ?> - <textarea name="fields<?php echo $field_name_appendix; ?>" + <textarea class="char" name="fields<?php echo $field_name_appendix; ?>" rows="<?php echo $cfg['CharTextareaRows']; ?>" cols="<?php echo $cfg['CharTextareaCols']; ?>" dir="<?php echo $text_dir; ?>" diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 55c5549..2e4410b 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -102,6 +102,10 @@ textarea { height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em; } +textarea.char { + height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em; +} + fieldset { margin-top: 1em; border: <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 293f119..b6c37d3 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -205,6 +205,9 @@ textarea { overflow: visible; height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em; } +textarea.char { + height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em; +} fieldset { margin-top: 1em; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-35-g6c98010
by Marc Delisle 29 Sep '11

29 Sep '11

The branch, QA_3_4 has been updated via 6c980106b7e49de3d94a2877ec4f23253d21ee0b (commit) from 55d1360b7e724ed2b3f9542024d3e8291ffcf7f5 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_change.php | 2 +- themes/original/css/theme_right.css.php | 4 ++++ themes/pmahomme/css/theme_right.css.php | 3 +++ 4 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4ad09f..d5cee34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog - bug #3390832 [display] Delete records from last page breaks search - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken - bug #3414744 [core] External link fails in 3.4.5 +- patch #3314626 [display] CharTextareaRows is not respected 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/tbl_change.php b/tbl_change.php index 22584db..213d383 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -981,7 +981,7 @@ foreach ($rows as $row_id => $vrow) { if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== FALSE)) { echo "\n"; ?> - <textarea name="fields<?php echo $field_name_appendix; ?>" + <textarea class="char" name="fields<?php echo $field_name_appendix; ?>" rows="<?php echo $cfg['CharTextareaRows']; ?>" cols="<?php echo $cfg['CharTextareaCols']; ?>" dir="<?php echo $text_dir; ?>" diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 8cd56eb..0ef7f74 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -109,6 +109,10 @@ textarea { height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em; } +textarea.char { + height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em; +} + fieldset { margin-top: 1em; border: <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 64209ce..fba2f23 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -226,6 +226,9 @@ textarea { overflow: visible; height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em; } +textarea.char { + height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em; +} fieldset { margin-top: 1em; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20512-gabe9351
by Madhura Jayaratne 29 Sep '11

29 Sep '11

The branch, master has been updated via abe93510a28dd5286518d80f6ca9c4bd7c9b7983 (commit) via 55d1360b7e724ed2b3f9542024d3e8291ffcf7f5 (commit) from e96b059dfa66a3a3287405b5e4f9d9e54d9b8e15 (commit) - Log ----------------------------------------------------------------- commit abe93510a28dd5286518d80f6ca9c4bd7c9b7983 Merge: e96b059 55d1360 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 29 21:17:26 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: sql.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sql.php b/sql.php index e941b7c..96fc6b5 100644 --- a/sql.php +++ b/sql.php @@ -482,6 +482,7 @@ if (strlen($db)) { if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { unset($result); $num_rows = 0; + $unlim_num_rows = 0; } else { if (isset($_SESSION['profiling']) && PMA_profilingSupported()) { PMA_DBI_query('SET PROFILING=1;'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-34-g55d1360
by Madhura Jayaratne 29 Sep '11

29 Sep '11

The branch, QA_3_4 has been updated via 55d1360b7e724ed2b3f9542024d3e8291ffcf7f5 (commit) from a9f2c3894282a3c3964a496652617e65d58be3e4 (commit) - Log ----------------------------------------------------------------- commit 55d1360b7e724ed2b3f9542024d3e8291ffcf7f5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 29 21:14:11 2011 +0530 To avoid a notice on undefined variable ----------------------------------------------------------------------- Summary of changes: sql.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sql.php b/sql.php index 6caeb7b..6b2628a 100644 --- a/sql.php +++ b/sql.php @@ -394,6 +394,7 @@ if (strlen($db)) { if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { unset($result); $num_rows = 0; + $unlim_num_rows = 0; } else { if (isset($_SESSION['profiling']) && PMA_profilingSupported()) { PMA_DBI_query('SET PROFILING=1;'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20510-ge96b059
by Madhura Jayaratne 29 Sep '11

29 Sep '11

The branch, master has been updated via e96b059dfa66a3a3287405b5e4f9d9e54d9b8e15 (commit) via a9f2c3894282a3c3964a496652617e65d58be3e4 (commit) from 963f478fdd0b2a3cd815b7dc7bbbae2d9a2fa1fd (commit) - Log ----------------------------------------------------------------- commit e96b059dfa66a3a3287405b5e4f9d9e54d9b8e15 Merge: 963f478 a9f2c38 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 29 19:45:48 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/core.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 035c8e7..425a6be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog - bug #3412862 [relation] Relations/constraints are dropped/created on every change - bug #3390832 [display] Delete records from last page breaks search - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken +- bug #3414744 [core] External link fails in 3.4.5 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/core.lib.php b/libraries/core.lib.php index e519576..56bdad2 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -244,7 +244,7 @@ function PMA_getPHPDocLink($target) /* l10n: Please check that translation actually exists. */ $lang = _pgettext('PHP documentation language', 'en'); - return 'http://php.net/manual/' . $lang . '/' . $target; + return PMA_linkURL('http://php.net/manual/' . $lang . '/' . $target); } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-33-ga9f2c38
by Madhura Jayaratne 29 Sep '11

29 Sep '11

The branch, QA_3_4 has been updated via a9f2c3894282a3c3964a496652617e65d58be3e4 (commit) from acbbd8fc56f45cdb648e52c3389e4cccf925f400 (commit) - Log ----------------------------------------------------------------- commit a9f2c3894282a3c3964a496652617e65d58be3e4 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 29 19:43:28 2011 +0530 bug #3414744 [core] External link fails in 3.4.5 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/core.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1746f5b..f4ad09f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - bug #3412862 [relation] Relations/constraints are dropped/created on every change - bug #3390832 [display] Delete records from last page breaks search - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken +- bug #3414744 [core] External link fails in 3.4.5 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 80c1f12..9166dc4 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -263,7 +263,7 @@ function PMA_getPHPDocLink($target) { /* l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. */ $lang = _pgettext('PHP documentation language', 'en'); - return 'http://php.net/manual/' . $lang . '/' . $target; + return PMA_linkURL('http://php.net/manual/' . $lang . '/' . $target); } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20508-g963f478
by Marc Delisle 29 Sep '11

29 Sep '11

The branch, master has been updated via 963f478fdd0b2a3cd815b7dc7bbbae2d9a2fa1fd (commit) via 86138fa9148805a911dde6e702c7be48712cf2f7 (commit) via acbbd8fc56f45cdb648e52c3389e4cccf925f400 (commit) via 789ed0d3d122f2165365cb5285b52c9885e6bffe (commit) from 86722781ebeb5f740c778ec22c72015d9d63a414 (commit) - Log ----------------------------------------------------------------- commit 963f478fdd0b2a3cd815b7dc7bbbae2d9a2fa1fd Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Sep 29 07:12:57 2011 -0400 Fix merge conflicts commit 86138fa9148805a911dde6e702c7be48712cf2f7 Merge: 8672278 acbbd8f Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Sep 29 07:06:48 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/schema/User_Schema.class.php | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc7d5b1..035c8e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ phpMyAdmin - ChangeLog - bug #3324161 [core] CSP policy causing designer JS buttons to fail - bug #3412862 [relation] Relations/constraints are dropped/created on every change - bug #3390832 [display] Delete records from last page breaks search +- bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 29b1bf3..26100b3 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -84,10 +84,10 @@ class PMA_User_Schema break; case 'delete_old_references': $this->_deleteTableRows( - $delrow, + $_POST['delrow'], $cfgRelation, $db, - $this->chosenPage + $_POST['chpage'] ); break; case 'process_export': @@ -352,7 +352,9 @@ class PMA_User_Schema echo "\n" . '</form>' . "\n\n"; } // end if - $this->_deleteTables($db, $this->chosenPage, isset($tabExist)); + if (isset($tabExist)) { + $this->_deleteTables($db, $this->chosenPage, $tabExist); + } } /** @@ -473,7 +475,7 @@ class PMA_User_Schema } if ($shoot) { echo '<form action="schema_edit.php" method="post">' . "\n" - . PMA_generate_common_hidden_inputs($db, $table) + . PMA_generate_common_hidden_inputs($db) . '<input type="hidden" name="do" value="delete_old_references" />' . "\n" . '<input type="hidden" name="chpage" value="' . htmlspecialchars($chpage) . '" />' . "\n" . __('The current page has references to tables that no longer exist. Would you like to delete those references?') hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-32-gacbbd8f
by Marc Delisle 29 Sep '11

29 Sep '11

The branch, QA_3_4 has been updated via acbbd8fc56f45cdb648e52c3389e4cccf925f400 (commit) from 789ed0d3d122f2165365cb5285b52c9885e6bffe (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/schema/User_Schema.class.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec2549f..1746f5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - bug #3324161 [core] CSP policy causing designer JS buttons to fail - bug #3412862 [relation] Relations/constraints are dropped/created on every change - bug #3390832 [display] Delete records from last page breaks search +- bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 17c2d39..310ffec 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -66,7 +66,7 @@ class PMA_User_Schema $this->_editCoordinates($db, $cfgRelation,$query_default_option); break; case 'delete_old_references': - $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->chosenPage); + $this->_deleteTableRows($_POST['delrow'], $cfgRelation, $db, $_POST['chpage']); break; case 'process_export': $this->_processExportSchema(); @@ -318,7 +318,7 @@ class PMA_User_Schema echo "\n" . '</form>' . "\n\n"; } // end if - $this->_deleteTables($db, $this->chosenPage, isset($tabExist)); + $this->_deleteTables($db, $this->chosenPage, $tabExist); } /** @@ -438,7 +438,7 @@ class PMA_User_Schema } if ($shoot) { echo '<form action="schema_edit.php" method="post">' . "\n" - . PMA_generate_common_hidden_inputs($db, $table) + . PMA_generate_common_hidden_inputs($db) . '<input type="hidden" name="do" value="delete_old_references" />' . "\n" . '<input type="hidden" name="chpage" value="' . htmlspecialchars($chpage) . '" />' . "\n" . __('The current page has references to tables that no longer exist. Would you like to delete those references?') hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20504-g8672278
by Marc Delisle 29 Sep '11

29 Sep '11

The branch, master has been updated via 86722781ebeb5f740c778ec22c72015d9d63a414 (commit) from 0ad7567d3f89e1e2481de5a588bfd0d93e8c5f1c (commit) - Log ----------------------------------------------------------------- commit 86722781ebeb5f740c778ec22c72015d9d63a414 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Sep 29 06:19:03 2011 -0400 A table has been dropped from outside phpMyAdmin ----------------------------------------------------------------------- Summary of changes: libraries/schema/User_Schema.class.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index ae0a629..29b1bf3 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -526,8 +526,12 @@ class PMA_User_Schema echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>'; if (isset($with_field_names)) { $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']); - foreach ($fields as $row) { - echo '<br />' . htmlspecialchars($row['Field']) . "\n"; + // if the table has been dropped from outside phpMyAdmin, + // we can no longer obtain its columns list + if ($fields) { + foreach ($fields as $row) { + echo '<br />' . htmlspecialchars($row['Field']) . "\n"; + } } } echo '</div>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-31-g789ed0d
by Marc Delisle 29 Sep '11

29 Sep '11

The branch, QA_3_4 has been updated via 789ed0d3d122f2165365cb5285b52c9885e6bffe (commit) from 37dff129010b54c90156f55e8e61ef4e7ac850d1 (commit) - Log ----------------------------------------------------------------- commit 789ed0d3d122f2165365cb5285b52c9885e6bffe Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Sep 29 06:08:30 2011 -0400 A table has been dropped from outside phpMyAdmin ----------------------------------------------------------------------- Summary of changes: libraries/schema/User_Schema.class.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index cb42dde..17c2d39 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -491,10 +491,12 @@ class PMA_User_Schema $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($temp_sh_page['table_name']) . ' FROM ' . PMA_backquote($db); - $fields_rs = PMA_DBI_query($local_query); + $fields_rs = PMA_DBI_try_query($local_query); unset($local_query); - $fields_cnt = PMA_DBI_num_rows($fields_rs); - + // the table has been dropped from outside phpMyAdmin + if (PMA_DBI_getError()) { + continue; + } echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>'; if (isset($with_field_names)) { while ($row = PMA_DBI_fetch_assoc($fields_rs)) { hooks/post-receive -- phpMyAdmin

1 0