- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6299-g6a422ca
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 6a422caf527226740155c7e3682f2f3c61a85696 (commit) from 44fd261fa64da13bfe363ea01cb79219849aee10 (commit) - Log ----------------------------------------------------------------- commit 6a422caf527226740155c7e3682f2f3c61a85696 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 14:46:04 2011 +0200 Proper escaping while checking for table (bug#3323066) ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 2625fe9..d9f19f3 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -383,7 +383,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals if ($table || (true === $tbl_is_group)) { $sql = 'SHOW TABLE STATUS FROM ' . PMA_backquote($each_database) - .' LIKE \'' . PMA_escape_mysql_wildcards(PMA_sqlAddSlashes($table)) . '%\''; + .' LIKE \'' . PMA_escape_mysql_wildcards(PMA_sqlAddSlashes($table, true)) . '%\''; } else { $sql = 'SHOW TABLE STATUS FROM ' . PMA_backquote($each_database); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6298-g44fd261
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 44fd261fa64da13bfe363ea01cb79219849aee10 (commit) via 78ee628312d43ccb6cb3a2f95ae98ade2eef478c (commit) from 5e05e80086c8621ce0abf8442005d2f44b93b0e3 (commit) - Log ----------------------------------------------------------------- commit 44fd261fa64da13bfe363ea01cb79219849aee10 Merge: 78ee628312d43ccb6cb3a2f95ae98ade2eef478c 5e05e80086c8621ce0abf8442005d2f44b93b0e3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 14:36:09 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 78ee628312d43ccb6cb3a2f95ae98ade2eef478c Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 14:34:06 2011 +0200 Use cache to skip blobstreaming check if server does not support it ----------------------------------------------------------------------- Summary of changes: libraries/blobstreaming.lib.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index fc5265b..c7250dc 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -47,6 +47,10 @@ function initPBMSDatabase() */ function checkBLOBStreamingPlugins() { + if (PMA_cacheGet('skip_blobstreaming', true) === true) { + return false; + } + // load PMA configuration $PMA_Config = $GLOBALS['PMA_Config']; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_3, updated. RELEASE_3_4_3RC1-8-gd3b67a3
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, MAINT_3_4_3 has been updated via d3b67a35a0df4969273529501788c68b4fddcc24 (commit) via e21d6073e46d41afbf0a09ba9bd38cd19f37e968 (commit) from 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) - Log ----------------------------------------------------------------- commit d3b67a35a0df4969273529501788c68b4fddcc24 Merge: e21d6073e46d41afbf0a09ba9bd38cd19f37e968 79d924add8c5e2070f7ab0301e1c98ac42fee806 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 08:23:05 2011 -0400 Merge branch 'MAINT_3_4_3' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into MAINT_3_4_3 commit e21d6073e46d41afbf0a09ba9bd38cd19f37e968 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 08:20:21 2011 -0400 3.4.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3a7ff6..cb3ba9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.3.0 (not yet released) +3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word diff --git a/Documentation.html b/Documentation.html index fb2a881..576c1f0 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.3-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.3-rc1 + 3.4.3 Documentation </h1> </div> diff --git a/README b/README index 53a08eb..02ad016 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.3-rc1 +Version 3.4.3 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 7081f83..cd1a0bf 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.3-rc1'); + $this->set('PMA_VERSION', '3.4.3'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6296-g5e05e80
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, master has been updated via 5e05e80086c8621ce0abf8442005d2f44b93b0e3 (commit) from 29e778d8e225d74aa714e6780af0fed033db5e4a (commit) - Log ----------------------------------------------------------------- commit 5e05e80086c8621ce0abf8442005d2f44b93b0e3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 08:21:46 2011 -0400 3.4.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34d07c5..d9d455e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,7 +31,7 @@ phpMyAdmin - ChangeLog - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser -3.4.3.0 (not yet released) +3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-16-gedf46c8
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, QA_3_4 has been updated via edf46c8022020099ac953b2e16f36f4f99687d87 (commit) from 43c7f939c31e9304cacbbc456d999d9d6afc8682 (commit) - Log ----------------------------------------------------------------- commit edf46c8022020099ac953b2e16f36f4f99687d87 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 08:21:06 2011 -0400 3.4.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70dab96..71db213 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser -3.4.3.0 (not yet released) +3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6295-g29e778d
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 29e778d8e225d74aa714e6780af0fed033db5e4a (commit) via 43c7f939c31e9304cacbbc456d999d9d6afc8682 (commit) via 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) from 7f9797bc6af1dc2348b5b748b557e387ec164319 (commit) - Log ----------------------------------------------------------------- commit 29e778d8e225d74aa714e6780af0fed033db5e4a Merge: 7f9797bc6af1dc2348b5b748b557e387ec164319 43c7f939c31e9304cacbbc456d999d9d6afc8682 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 13:56:29 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 5406e9f..4bb3a03 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -258,7 +258,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="full text">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-15-g43c7f93
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, QA_3_4 has been updated via 43c7f939c31e9304cacbbc456d999d9d6afc8682 (commit) via 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) from 5e28dbea224d21b2c03cd325ef67f36b42d2b58d (commit) - Log ----------------------------------------------------------------- commit 43c7f939c31e9304cacbbc456d999d9d6afc8682 Merge: 5e28dbea224d21b2c03cd325ef67f36b42d2b58d 79d924add8c5e2070f7ab0301e1c98ac42fee806 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 13:56:05 2011 +0200 Merge branch 'MAINT_3_4_3' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index ffdb0d2..077dbcf 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="full text">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_3, updated. RELEASE_3_4_3RC1-6-g79d924a
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, MAINT_3_4_3 has been updated via 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) from 4bec3b3bee31a1bd88a176f8c1cd5033c970fece (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index ffdb0d2..077dbcf 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="full text">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6292-g7f9797b
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 7f9797bc6af1dc2348b5b748b557e387ec164319 (commit) from 93db9fdc127ff086d5fa4f15abb25b9fd973e401 (commit) - Log ----------------------------------------------------------------- commit 7f9797bc6af1dc2348b5b748b557e387ec164319 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Wed Jun 22 20:45:14 2011 +0200 Hides the bookmarkoptions checkboxes when the bookmark label is empty ----------------------------------------------------------------------- Summary of changes: js/sql.js | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/js/sql.js b/js/sql.js index b89d48b..14f4c05 100644 --- a/js/sql.js +++ b/js/sql.js @@ -187,6 +187,13 @@ $(document).ready(function() { cache: 'false' }); + /* Hides the bookmarkoptions checkboxes when the bookmark label is empty */ + $('input#bkm_label').keyup(function() { + $('input#id_bkm_all_users, input#id_bkm_replace') + .parent() + .toggle($(this).attr('value').length > 0); + }).trigger('keyup'); + /** * current value of the direction in which the table is displayed * @type String hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6291-g93db9fd
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, master has been updated via 93db9fdc127ff086d5fa4f15abb25b9fd973e401 (commit) via 7ecd11483e9d245b524cac0dfff00abd090c5985 (commit) via 1970c357a30c44c410578bd4513dfb77125d6126 (commit) via f7157a5fc6d449a95e347224b59fa95ce1860c46 (commit) via 1d9f5cdf7354d02db0a39ddfbd9a775fbbdaff1f (commit) via 610509e3841f57cd244d624148f8125b0d9e2d1e (commit) via 146a8da5e93c3a187dd7ef2f5715be777b0e2d9e (commit) from 6b06041f340459bbcbb2dc306c64988e11ae7a42 (commit) - Log ----------------------------------------------------------------- commit 93db9fdc127ff086d5fa4f15abb25b9fd973e401 Merge: 7ecd11483e9d245b524cac0dfff00abd090c5985 6b06041f340459bbcbb2dc306c64988e11ae7a42 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 07:44:20 2011 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 7ecd11483e9d245b524cac0dfff00abd090c5985 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 07:43:15 2011 -0400 ChangeLog entry commit 1970c357a30c44c410578bd4513dfb77125d6126 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 07:39:47 2011 -0400 These are jQuery objects commit f7157a5fc6d449a95e347224b59fa95ce1860c46 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 07:32:14 2011 -0400 Typos commit 1d9f5cdf7354d02db0a39ddfbd9a775fbbdaff1f Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jun 26 23:28:34 2011 +0530 Fixed bugs in show error message ine multi row change in table structure commit 610509e3841f57cd244d624148f8125b0d9e2d1e Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 25 21:26:56 2011 +0530 Fixed bugs in multi column change in table structure commit 146a8da5e93c3a187dd7ef2f5715be777b0e2d9e Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 25 16:57:54 2011 +0530 Ajaxified the multi column change in table structure ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 7 ++- js/tbl_structure.js | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++- tbl_alter.php | 3 +- tbl_structure.php | 16 ++++---- 5 files changed, 121 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16c8f88..34d07c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog + [display] More options for browsing GIS data + [interface] Support for spatial indexes + [display] GIS data visualization ++ AJAX for table structure multiple-columns change 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/js/functions.js b/js/functions.js index 436805c..397f248 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2013,6 +2013,10 @@ $(document).ready(function() { * Hides certain table structure actions, replacing them with the word "More". They are displayed * in a dropdown menu when the user hovers over the word "More." */ + displayMoreTableOpts(); +}); + +function displayMoreTableOpts() { // Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers) // if the table is not a view or information_schema (otherwise there is only one action to hide and there's no point) if($("input[type='hidden'][name='table_type']").val() == "table") { @@ -2081,8 +2085,7 @@ $(document).ready(function() { } }); } -}); - +} $(document).ready(initTooltips); /* Displays tooltips */ diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 352848c..d1a2676 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -145,5 +145,109 @@ $(document).ready(function() { }) // end $.get() }) // end $.PMA_confirm() }) //end Drop Primary Key/Index - + + /** + *Ajax event handler for muti column change + **/ + $("#fieldsForm.ajax .mult_submit[value=change]").live('click', function(event){ + event.preventDefault(); + + /*Check whether atleast one row is selected for change*/ + if($("#tablestructure tbody tr").hasClass("marked")){ + var div = $('<div id="change_column_dialog"></div>'); + + /** + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ + var button_options = {}; + // in the following function we need to use $(this) + button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();} + + var button_options_error = {}; + button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();} + var $form = $("#fieldsForm"); + var $msgbox = PMA_ajaxShowMessage(); + + $.get( $form.attr('action') , $form.serialize()+"&ajax_request=true&submit_mult=change" , function(data) { + //in the case of an error, show the error message returned. + if (data.success != undefined && data.success == false) { + div + .append(data.error) + .dialog({ + title: PMA_messages['strChangeTbl'], + height: 230, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options_error + })// end dialog options + } else { + div + .append(data) + .dialog({ + title: PMA_messages['strChangeTbl'], + height: 600, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options + }) + //Remove the top menu container from the dialog + .find("#topmenucontainer").hide() + ; // end dialog options + $("#append_fields_form input[name=do_save_data]").addClass("ajax"); + } + PMA_ajaxRemoveMessage($msgbox); + }) // end $.get() + } else { + PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']); + } + }); + + /** + *Ajax action for submitting the column change form + **/ + $("#append_fields_form input[name=do_save_data].ajax").live('click', function(event) { + event.preventDefault(); + /** + * @var the_form object referring to the export form + */ + var $form = $("#append_fields_form"); + + PMA_prepareForAjaxRequest($form); + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } else if ($(".error").length != 0) { + $(".error").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + if ($("#change_column_dialog").length > 0) { + $("#change_column_dialog").dialog("close").remove(); + } + /*Reload the field form*/ + $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { + $("#fieldsForm").remove(); + var $temp_div = $("<div id='temp_div'><div>").append(form_data); + if ($("#sqlqueryresults").length != 0) { + $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); + } else { + $temp_div.find("#fieldsForm").insertAfter(".error"); + } + /*Call the function to display the more options in table*/ + displayMoreTableOpts(); + }); + } else { + var $temp_div = $("<div id='temp_div'><div>").append(data); + var $error = $temp_div.find(".error code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + }) // end insert table button "do_save_data" + }) // end $(document).ready() diff --git a/tbl_alter.php b/tbl_alter.php index 1c2d7fb..743e925 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -131,7 +131,8 @@ if (isset($_REQUEST['do_save_data'])) { } if( $GLOBALS['is_ajax_request'] == true) { - PMA_ajaxResponse($message, $message->isSuccess()); + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + PMA_ajaxResponse($message, $message->isSuccess(),$extra_data); } $active_page = 'tbl_structure.php'; diff --git a/tbl_structure.php b/tbl_structure.php index f3ce162..5406e9f 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -185,16 +185,16 @@ $hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Add FUL // table header $i = 0; ?> -<form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm"> +<form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); echo '<input type="hidden" name="table_type" value='; - if($db_is_information_schema) { - echo '"information_schema" />'; - } else if ($tbl_is_view) { - echo '"view" />'; - } else { - echo '"table" />'; - } ?> + if($db_is_information_schema) { + echo '"information_schema" />'; + } else if ($tbl_is_view) { + echo '"view" />'; + } else { + echo '"table" />'; + } ?> <table id="tablestructure" class="data"> <thead> hooks/post-receive -- phpMyAdmin

1 0