Git October 2011

git@phpmyadmin.net

6 participants
164 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20778-gb5e63b5

by Marc Delisle

The branch, master has been updated via b5e63b56a98ce5d46bf5c654c0427ec426688dfc (commit) via a6fc7ac92836e6e25cb8efc98c014a0e3a7e55ca (commit) from 328defc9d99f6cb6e9450a6b708474923908faea (commit) - Log ----------------------------------------------------------------- commit b5e63b56a98ce5d46bf5c654c0427ec426688dfc Merge: 328defc a6fc7ac Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 10 08:54:44 2011 -0400 Fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + navigation.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5ca9e7..a279813 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418849 [interface] Inline edit shows dropdowns even after closing - bug [view] View renaming did not work +- bug [navi] Wrong icon for view (MySQL 5.5) 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/navigation.php b/navigation.php index 126b00d..230040b 100644 --- a/navigation.php +++ b/navigation.php @@ -597,7 +597,7 @@ function PMA_displayTableList($tables, $visible = false, .'&goto=' . $GLOBALS['cfg']['LeftDefaultTabTable'] . '" >'; $attr = array('id' => 'icon_' . htmlspecialchars($table_db . '.' . $table['Name'])); - if ('VIEW' === strtoupper($table['Comment'])) { + if (PMA_Table::isView($table_db, $table['Name'])) { echo PMA_getImage('s_views.png', htmlspecialchars($link_title), $attr); } else { echo PMA_getImage('b_browse.png', htmlspecialchars($link_title), $attr); hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6RC1-12-ga6fc7ac

by Marc Delisle

The branch, QA_3_4 has been updated via a6fc7ac92836e6e25cb8efc98c014a0e3a7e55ca (commit) from 6fec80c61445dc11b4ff3023947b9882e163d382 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + navigation.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 100a933..9ffe264 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418849 [interface] Inline edit shows dropdowns even after closing - bug [view] View renaming did not work +- bug [navi] Wrong icon for view (MySQL 5.5) 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/navigation.php b/navigation.php index ea77489..a607f28 100644 --- a/navigation.php +++ b/navigation.php @@ -625,7 +625,8 @@ function PMA_displayTableList($tables, $visible = false, .'&goto=' . $GLOBALS['cfg']['LeftDefaultTabTable'] . '" >' .'<img class="icon"'; - if ('VIEW' === strtoupper($table['Comment'])) { + + if (PMA_Table::isView($table_db, $table['Name'])) { echo ' src="' . $GLOBALS['pmaThemeImage'] . 's_views.png"'; } else { echo ' src="' . $GLOBALS['pmaThemeImage'] . 'b_sbrowse.png"'; hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20776-g328defc

by Marc Delisle

The branch, master has been updated via 328defc9d99f6cb6e9450a6b708474923908faea (commit) via 6fec80c61445dc11b4ff3023947b9882e163d382 (commit) from 6e1258f95460eb244ff1807cc956e394ec1d7de7 (commit) - Log ----------------------------------------------------------------- commit 328defc9d99f6cb6e9450a6b708474923908faea Merge: 6e1258f 6fec80c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 10 07:25:52 2011 -0400 bug [view] View renaming did not work ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/Table.class.php | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83d7660..a5ca9e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog 3.4.7.0 (not yet released) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418849 [interface] Inline edit shows dropdowns even after closing +- bug [view] View renaming did not work 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 34b144a..7878b8e 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1104,6 +1104,7 @@ class PMA_Table * @param string $new_name new table name * @param string $new_db new database name * @param bool $is_view is this for a VIEW rename? + * @todo remove the $is_view parameter (also in callers) * * @return bool success */ @@ -1130,15 +1131,12 @@ class PMA_Table return false; } - if (! $is_view) { - $GLOBALS['sql_query'] = ' - RENAME TABLE ' . $this->getFullName(true) . ' - TO ' . $new_table->getFullName(true) . ';'; - } else { - $GLOBALS['sql_query'] = ' - ALTER TABLE ' . $this->getFullName(true) . ' - RENAME ' . $new_table->getFullName(true) . ';'; - } + /* + * tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13 + */ + $GLOBALS['sql_query'] = ' + RENAME TABLE ' . $this->getFullName(true) . ' + TO ' . $new_table->getFullName(true) . ';'; // I don't think a specific error message for views is necessary if (! PMA_DBI_query($GLOBALS['sql_query'])) { $this->errors[] = sprintf( hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6RC1-11-g6fec80c

by Marc Delisle

The branch, QA_3_4 has been updated via 6fec80c61445dc11b4ff3023947b9882e163d382 (commit) from 329c9cac680114accbffbceff2e688924e1edb1f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/Table.class.php | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f884d4a..100a933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 3.4.7.0 (not yet released) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418849 [interface] Inline edit shows dropdowns even after closing +- bug [view] View renaming did not work 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/Table.class.php b/libraries/Table.class.php index a29900e..d7af2d7 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1008,6 +1008,7 @@ class PMA_Table * @param string new database name * @param boolean is this for a VIEW rename? * @return boolean success + * @todo remove the $is_view parameter (also in callers) */ function rename($new_name, $new_db = null, $is_view = false) { @@ -1032,15 +1033,12 @@ class PMA_Table return false; } - if (! $is_view) { - $GLOBALS['sql_query'] = ' - RENAME TABLE ' . $this->getFullName(true) . ' - TO ' . $new_table->getFullName(true) . ';'; - } else { - $GLOBALS['sql_query'] = ' - ALTER TABLE ' . $this->getFullName(true) . ' - RENAME ' . $new_table->getFullName(true) . ';'; - } + /* + * tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13 + */ + $GLOBALS['sql_query'] = ' + RENAME TABLE ' . $this->getFullName(true) . ' + TO ' . $new_table->getFullName(true) . ';'; // I don't think a specific error message for views is necessary if (! PMA_DBI_query($GLOBALS['sql_query'])) { $this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName()); hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20774-g6e1258f

by Madhura Jayaratne

The branch, master has been updated via 6e1258f95460eb244ff1807cc956e394ec1d7de7 (commit) via 84c1b79a0884fd8875632cac7d32df2385879b4a (commit) via 39cd736648e2b9a631ff7d4c1394bfbc3bc35597 (commit) from c0120649fb23f4c26981f60f2b8aafff5859cdba (commit) - Log ----------------------------------------------------------------- commit 6e1258f95460eb244ff1807cc956e394ec1d7de7 Merge: 84c1b79 c012064 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Oct 10 08:01:44 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 84c1b79a0884fd8875632cac7d32df2385879b4a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Oct 10 07:32:16 2011 +0530 Typo in comment commit 39cd736648e2b9a631ff7d4c1394bfbc3bc35597 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Oct 10 07:31:35 2011 +0530 When in 'show as php' mode, no need to have 'refresh'. 'Submit query' is there instead. ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 5dcf21e..6054412 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1219,13 +1219,14 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // Refresh query if (! empty($cfg['SQLQuery']['Refresh']) + && ! isset($GLOBALS['show_as_php']) // 'Submit query' does the same && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query) ) { $refresh_link = 'import.php' . PMA_generate_common_url($url_params); $refresh_link = ' [' . PMA_linkOrButton($refresh_link, __('Refresh')) . ']'; } else { $refresh_link = ''; - } //show as php + } //refresh if (! empty($cfg['SQLValidator']['use']) && ! empty($cfg['SQLQuery']['Validate']) @@ -3151,7 +3152,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) /* Backward compatibility in 3.5.x */ if (strpos($string, '@FIELDS@') !== false) { - $string = strtr($string, array('@FIELDS@' => '@COLUMNS@')); + $string = strtr($string, array('@FIELDS@' => '@COLUMNS@')); } /* Fetch columns list if required */ hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20771-gc012064

by Marc Delisle

The branch, master has been updated via c0120649fb23f4c26981f60f2b8aafff5859cdba (commit) from f2d1aa683292cc269966d56850e317dc2aae2cb4 (commit) - Log ----------------------------------------------------------------- commit c0120649fb23f4c26981f60f2b8aafff5859cdba Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 9 15:41:42 2011 -0400 - Refer to window.document - No need for variables here Thanks to Piotr for the tips ----------------------------------------------------------------------- Summary of changes: js/functions.js | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/js/functions.js b/js/functions.js index 0ed1a22..f9a2494 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1491,12 +1491,6 @@ function PMA_createTableDialog( div, url , target) button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();} var $msgbox = PMA_ajaxShowMessage(); - /* - * Use a little less than the current value, otherwise there is some - * overlap; 16 is a value found by experimenting - */ - var current_width = $(top.frame_content).width() - 16; - var current_height = $(top.frame_content).height() - 16; $.get( target , url , function(data) { //in the case of an error, show the error message returned. @@ -1517,8 +1511,12 @@ function PMA_createTableDialog( div, url , target) .append(data) .dialog({ title: PMA_messages['strCreateTable'], - height: current_height, - width: current_width, + /* + * Use a little less than the current value, otherwise there is i + * some overlap; 16 is a value found by experimenting + */ + height: $(window.document).height() - 16, + width: $(window.document).width() - 16, open: PMA_verifyTypeOfAllColumns, buttons : button_options }); // end dialog options hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20770-gf2d1aa6

by Marc Delisle

The branch, master has been updated via f2d1aa683292cc269966d56850e317dc2aae2cb4 (commit) from 8945a2a614cd4d62a462da339b3e8dd099f3115e (commit) - Log ----------------------------------------------------------------- commit f2d1aa683292cc269966d56850e317dc2aae2cb4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Oct 9 15:27:55 2011 -0400 Need to call PMA_createTableDialog() in the context of frame_content, in order for the qtip tooltips to work ----------------------------------------------------------------------- Summary of changes: js/navigation.js | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 724d9f9..af5146a 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -229,8 +229,12 @@ $(document).ready(function(){ var div = parent.frame_content.$('<div id="create_table_dialog"></div>'); var target = "tbl_create.php"; - /*Calling to the createTableDialog function*/ - PMA_createTableDialog(div , url , target); + /* + * Calling to the createTableDialog function + * (needs to be done in the context of frame_content in order + * for the qtip tooltips to work) + * */ + parent.frame_content.PMA_createTableDialog(div , url , target); });//end of create new table });//end of document get ready hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20769-g8945a2a

by Marc Delisle

The branch, master has been updated via 8945a2a614cd4d62a462da339b3e8dd099f3115e (commit) from 554c1df307b47516dc0249fc75bdec2ad5c5e5a1 (commit) - Log ----------------------------------------------------------------- commit 8945a2a614cd4d62a462da339b3e8dd099f3115e Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 9 07:42:10 2011 -0400 Convert footnotes to tooltips in Create table dialog - works when called from main panel - from navi panel, this commit fixed a js error but the tooltips do not appear yet ----------------------------------------------------------------------- Summary of changes: js/functions.js | 1 + navigation.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9d14eec..0ed1a22 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1523,6 +1523,7 @@ function PMA_createTableDialog( div, url , target) buttons : button_options }); // end dialog options } + PMA_convertFootnotesToTooltips($(div)); PMA_ajaxRemoveMessage($msgbox); }) // end $.get() diff --git a/navigation.php b/navigation.php index 300bdb5..126b00d 100644 --- a/navigation.php +++ b/navigation.php @@ -107,6 +107,7 @@ require_once './libraries/header_http.inc.php'; <?php echo PMA_includeJS('jquery/jquery-1.6.2.js'); echo PMA_includeJS('jquery/jquery-ui-1.8.custom.js'); + echo PMA_includeJS('jquery/jquery.qtip-1.0.0-rc3.js'); echo PMA_includeJS('navigation.js'); echo PMA_includeJS('functions.js'); echo PMA_includeJS('messages.php'); hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20768-g554c1df

by Marc Delisle

The branch, master has been updated via 554c1df307b47516dc0249fc75bdec2ad5c5e5a1 (commit) from eef315c6354950687004007f66e8982c90836c4d (commit) - Log ----------------------------------------------------------------- commit 554c1df307b47516dc0249fc75bdec2ad5c5e5a1 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 9 06:45:32 2011 -0400 Increase the size of the Create table dialog, based on the frame size ----------------------------------------------------------------------- Summary of changes: js/functions.js | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index b8db515..9d14eec 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1491,6 +1491,12 @@ function PMA_createTableDialog( div, url , target) button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();} var $msgbox = PMA_ajaxShowMessage(); + /* + * Use a little less than the current value, otherwise there is some + * overlap; 16 is a value found by experimenting + */ + var current_width = $(top.frame_content).width() - 16; + var current_height = $(top.frame_content).height() - 16; $.get( target , url , function(data) { //in the case of an error, show the error message returned. @@ -1511,8 +1517,8 @@ function PMA_createTableDialog( div, url , target) .append(data) .dialog({ title: PMA_messages['strCreateTable'], - height: 600, - width: 900, + height: current_height, + width: current_width, open: PMA_verifyTypeOfAllColumns, buttons : button_options }); // end dialog options hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20767-geef315c

by Madhura Jayaratne

The branch, master has been updated via eef315c6354950687004007f66e8982c90836c4d (commit) via bf4b95dafe3f6bc2489872739a13eac2f8c857e1 (commit) via f06e8ee9fca47c049b74b1224e20b12a26fa5934 (commit) via 329c9cac680114accbffbceff2e688924e1edb1f (commit) via 55f2d0726bbe0f8846d1cb397972c372d3ea955e (commit) from 43f22790cb27e7a878c090161500083cdc1ae7ec (commit) - Log ----------------------------------------------------------------- commit eef315c6354950687004007f66e8982c90836c4d Merge: bf4b95d 43f2279 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Oct 8 17:27:26 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit bf4b95dafe3f6bc2489872739a13eac2f8c857e1 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Oct 8 14:33:39 2011 +0530 Little bit more width for tables commit f06e8ee9fca47c049b74b1224e20b12a26fa5934 Merge: 00fcdb2 329c9ca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Oct 8 14:26:48 2011 +0530 Merge branch 'QA_3_4' Conflicts: libraries/schema/Pdf_Relation_Schema.class.php libraries/schema/User_Schema.class.php ----------------------------------------------------------------------- Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 2 +- libraries/schema/User_Schema.class.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ff1a000..a0c1171 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -489,7 +489,7 @@ class Table_Stats foreach ($this->fields as $field) { $this->width = max($this->width, $pdf->GetStringWidth($field)); } - $this->width += $pdf->GetStringWidth(' '); + $this->width += $pdf->GetStringWidth(' '); $pdf->SetFont($this->_ff, 'B', $fontSize); /* * it is unknown what value must be added, because diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 9de8327..a155995 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -87,7 +87,7 @@ class PMA_User_Schema $_POST['delrow'], $cfgRelation, $db, - $_POST['chpage'] + $_POST['chpage'] ); break; case 'process_export': @@ -232,11 +232,12 @@ class PMA_User_Schema $selectboxall[] = $val[0]; } + $tabExist = array(); + /* * Now if we already have chosen a page number then we should * show the tables involved */ - if (isset($this->chosenPage) && $this->chosenPage > 0) { echo "\n"; ?> hooks/post-receive -- phpMyAdmin

12 years, 11 months

← Newer
1
...
8
9
10
11
12
13
14
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git October 2011