Git

git@phpmyadmin.net

14 participants
38257 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-815-g4c7aa9c
by Marc Delisle 19 Feb '11

19 Feb '11

The branch, master has been updated via 4c7aa9cfee0f6135501242fb5708cfed40cc6be0 (commit) from 624ec9c5f9ddeb2394b206ba38f500a7d5181f0a (commit) - Log ----------------------------------------------------------------- commit 4c7aa9cfee0f6135501242fb5708cfed40cc6be0 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 11:20:11 2011 -0500 No need to show the "Hide query box" initially ----------------------------------------------------------------------- Summary of changes: js/sql.js | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index be6a7ab..219b28c 100644 --- a/js/sql.js +++ b/js/sql.js @@ -192,12 +192,15 @@ $(document).ready(function() { if (! $('#sqlqueryform').find('a').is('#togglequerybox')) { $('<a id="togglequerybox"></a>') .html(PMA_messages['strHideQueryBox']) - .appendTo("#sqlqueryform"); + .appendTo("#sqlqueryform") + // initially hidden because at this point, nothing else + // appears under the link + .hide(); // Attach the toggling of the query box visibility to a click $("#togglequerybox").bind('click', function() { var $link = $(this) - $link.siblings().slideToggle("medium"); + $link.siblings().slideToggle("fast"); if ($link.text() == PMA_messages['strHideQueryBox']) { $link.text(PMA_messages['strShowQueryBox']); } else { @@ -263,6 +266,7 @@ $(document).ready(function() { $('#sqlqueryresults').show(); $("#sqlqueryresults").html(data); $("#sqlqueryresults").trigger('appendAnchor'); + $('#togglequerybox').show(); if($("#togglequerybox").siblings(":visible").length > 0) { $("#togglequerybox").trigger('click'); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-814-g624ec9c
by Marc Delisle 19 Feb '11

19 Feb '11

The branch, master has been updated via 624ec9c5f9ddeb2394b206ba38f500a7d5181f0a (commit) from 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d (commit) - Log ----------------------------------------------------------------- commit 624ec9c5f9ddeb2394b206ba38f500a7d5181f0a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 10:38:58 2011 -0500 Make edit privileges panel more manageable ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index a18ec9f..5fe8398 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -212,6 +212,7 @@ $(document).ready(function() { width: 800, // height is a workaround for this Chrome problem: // http://bugs.jqueryui.com/ticket/4671 + // also it's interesting to be able to scroll this window height: 600, modal: true, buttons: button_options @@ -322,6 +323,7 @@ $(document).ready(function() { .append(data) .dialog({ width: 900, + height: 600, buttons: button_options }); //dialog options end displayPasswordGenerateButton(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-813-g67339ba
by Marc Delisle 19 Feb '11

19 Feb '11

The branch, master has been updated via 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d (commit) from 60f85e193449f02cb81550be8dc3476d0b04e812 (commit) - Log ----------------------------------------------------------------- commit 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 07:49:49 2011 -0500 Current code has problems with Ajax, for example when creating a user. There are missing headers and this commit is an attempt to fix this situation. ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 14 +++++++++----- libraries/header.inc.php | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 95aaae6..a4c6a71 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2935,11 +2935,15 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) $response = array_merge($response, $extra_data); } - // Set the Content-Type header to JSON so that jQuery parses the response correctly - if(!isset($GLOBALS['is_header_sent'])) { - header('Cache-Control: no-cache'); - header("Content-Type: application/json"); - } + // Set the Content-Type header to JSON so that jQuery parses the + // response correctly. + // + // At this point, other headers might have been sent; + // even if $GLOBALS['is_header_sent'] is true, + // we have to send these additional headers. + header('Cache-Control: no-cache'); + header("Content-Type: application/json"); + echo json_encode($response); exit; } diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 1720e80..807ec0a 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -15,7 +15,7 @@ require_once './libraries/common.inc.php'; /** - * If this is an Ajax request, we do not need to generate all this output. + * This is not an Ajax request so we need to generate all this output. */ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-812-g60f85e1
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via 60f85e193449f02cb81550be8dc3476d0b04e812 (commit) from aef93ba59230af6932cbdfea83a1f60d56676794 (commit) - Log ----------------------------------------------------------------- commit 60f85e193449f02cb81550be8dc3476d0b04e812 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 12:55:51 2011 -0500 Improve full mode navi display when CountTables is false ----------------------------------------------------------------------- Summary of changes: navigation.php | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/navigation.php b/navigation.php index ef191fe..381b561 100644 --- a/navigation.php +++ b/navigation.php @@ -423,18 +423,23 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { . '?' . $common_url_query; ?>', 'main'); return false;"> <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + // Might be unset if CountTables directive is false + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'rtl') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } echo htmlspecialchars($db['disp_name']); - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'ltr') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } ?> </a> <?php } else { - // with only 1 db available we dont need to refresh left frame + // with only 1 db available we dont need to refresh navi frame // on db selection, only phpmain ?> <a href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] @@ -442,12 +447,16 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { id="<?php echo htmlspecialchars($db['name']); ?>" title="<?php echo htmlspecialchars($db['comment']); ?>"> <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'rtl') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } echo htmlspecialchars($db['disp_name']); - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'ltr') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } ?> </a> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-811-gaef93ba
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via aef93ba59230af6932cbdfea83a1f60d56676794 (commit) from 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit) - Log ----------------------------------------------------------------- commit aef93ba59230af6932cbdfea83a1f60d56676794 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 12:44:33 2011 -0500 Bug #3178935 Navigation full mode: no expansion ----------------------------------------------------------------------- Summary of changes: navigation.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/navigation.php b/navigation.php index c162aa2..ef191fe 100644 --- a/navigation.php +++ b/navigation.php @@ -453,7 +453,7 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { </a> <?php } - if ($db['num_tables']) { + if (($GLOBALS['cfg']['Server']['CountTables'] === false) || $db['num_tables']) { if (isset($tables_full[$db['name']])) { $tables = PMA_getTableList($db['name'], $tables_full[$db['name']]); } elseif (isset($tables_full[strtolower($db['name'])])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-810-g8cd7179
by Madhura Jayaratne 18 Feb '11

18 Feb '11

The branch, master has been updated via 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit) via da82fe392b0ac802284abee3810aae9f2bc4b381 (commit) from e831df2a32e7aa7f420fca1c65b797891a298fca (commit) - Log ----------------------------------------------------------------- commit 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 Merge: da82fe392b0ac802284abee3810aae9f2bc4b381 e831df2a32e7aa7f420fca1c65b797891a298fca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 18:56:20 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit da82fe392b0ac802284abee3810aae9f2bc4b381 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 18:54:36 2011 +0530 Bug #3183970 Losing SQL history ----------------------------------------------------------------------- Summary of changes: libraries/relation.lib.php | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 18504e2..9588853 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -22,7 +22,7 @@ if (! defined('PHPMYADMIN')) { */ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) { - // Avoid caching of the number of rows affected; for example, this function + // Avoid caching of the number of rows affected; for example, this function // is called for tracking purposes but we want to display the correct number // of rows affected by the original query, not by the query generated for // tracking. @@ -760,10 +760,6 @@ function PMA_getHistory($username) { $cfgRelation = PMA_getRelationsParam(); - if (isset($_SESSION['sql_history'])) { - return array_reverse($_SESSION['sql_history']); - } - if (! $cfgRelation['historywork']) { return false; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-808-ge831df2
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via e831df2a32e7aa7f420fca1c65b797891a298fca (commit) from 2410839251d72a6947d291f0174a85bcf9b53e53 (commit) - Log ----------------------------------------------------------------- commit e831df2a32e7aa7f420fca1c65b797891a298fca Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 08:23:09 2011 -0500 Bug #3185710 No window with the confirmation of this operation ----------------------------------------------------------------------- Summary of changes: js/sql.js | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index 8173b5e..be6a7ab 100644 --- a/js/sql.js +++ b/js/sql.js @@ -230,10 +230,17 @@ $(document).ready(function() { $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { - // fade out previous success message, if any + // fade out previous messages, if any $('.success').fadeOut(); + $('.sqlquery_message').fadeOut(); // show a message that stays on screen $('#sqlqueryform').before(data.message); + // and display the query + $('<div class="sqlquery_message"></div>') + .html(data.sql_query) + .insertBefore('#sqlqueryform'); + // unnecessary div that came from data.sql_query + $('.notice').remove(); $('#sqlqueryresults').show(); // this happens if a USE command was typed if (typeof data.reload != 'undefined') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-807-g2410839
by Madhura Jayaratne 18 Feb '11

18 Feb '11

The branch, master has been updated via 2410839251d72a6947d291f0174a85bcf9b53e53 (commit) from 2a754b25e44212a9d3cca035f29c86705ac8c2da (commit) - Log ----------------------------------------------------------------- commit 2410839251d72a6947d291f0174a85bcf9b53e53 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 11:47:42 2011 +0530 Should be NULL, not 'NULL' ----------------------------------------------------------------------- Summary of changes: js/sql.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index fd38843..8173b5e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -649,9 +649,10 @@ $(document).ready(function() { for (var key in params_to_submit) { value = params_to_submit[key]; if (value.length == 0) { - value = 'NULL'; + sql_query += ' ' + key + "=NULL, "; + } else { + sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; } - sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; } //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-806-g2a754b2
by Madhura Jayaratne 18 Feb '11

18 Feb '11

The branch, master has been updated via 2a754b25e44212a9d3cca035f29c86705ac8c2da (commit) from 82a1d451d1fad0164b4efde5b89a7f4f989b18ba (commit) - Log ----------------------------------------------------------------- commit 2a754b25e44212a9d3cca035f29c86705ac8c2da Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 07:35:12 2011 +0530 Bug #3184827 Inline edit fails on some tables ----------------------------------------------------------------------- Summary of changes: js/sql.js | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/js/sql.js b/js/sql.js index d286348..fd38843 100644 --- a/js/sql.js +++ b/js/sql.js @@ -643,12 +643,16 @@ $(document).ready(function() { */ var sql_query = 'UPDATE ' + window.parent.table + ' SET '; - $.each(params_to_submit, function(key, value) { - if(value.length == 0) { - value = 'NULL' - } - sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; - }) + // $.each() not used here since it cause problems when there is a column + // in the table with the name 'length'. See bug #3184827 + var value; + for (var key in params_to_submit) { + value = params_to_submit[key]; + if (value.length == 0) { + value = 'NULL'; + } + sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; + } //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); sql_query += ' WHERE ' + PMA_urldecode(where_clause); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-805-g82a1d45
by Madhura Jayaratne 17 Feb '11

17 Feb '11

The branch, master has been updated via 82a1d451d1fad0164b4efde5b89a7f4f989b18ba (commit) via bd8126735f5dce0e894f2e7e549a6322f30936ca (commit) from 66282adec9a900d98afa910f78d97352c75d300a (commit) - Log ----------------------------------------------------------------- commit 82a1d451d1fad0164b4efde5b89a7f4f989b18ba Merge: bd8126735f5dce0e894f2e7e549a6322f30936ca 66282adec9a900d98afa910f78d97352c75d300a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 00:36:15 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit bd8126735f5dce0e894f2e7e549a6322f30936ca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 00:34:19 2011 +0530 Inline edit fails for foreign keys. ----------------------------------------------------------------------- Summary of changes: sql.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sql.php b/sql.php index 0232620..3655d87 100644 --- a/sql.php +++ b/sql.php @@ -65,9 +65,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value $foreignData = PMA_getForeignData($foreigners, $column, false, '', ''); - $dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']); - - if( $dropdown == '<option value=""> </option>'."\n" ) { + if ($foreignData['disp_row'] == null) { //Handle the case when number of values is more than $cfg['ForeignKeyMaxLimit'] $_url_params = array( 'db' => $db, @@ -80,6 +78,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value .'>' . __('Browse foreign values') . '</a>'; } else { + $dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']); $dropdown = '<select>' . $dropdown . '</select>'; } hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git