- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1021-g30696bc
by Marc Delisle 22 Dec '10

22 Dec '10

The branch, master has been updated via 30696bcbd0d5af3785ee4adf66a8602724febeb1 (commit) from eee76d640b86b036f38fb0df3ed1aa22ca9503f6 (commit) - Log ----------------------------------------------------------------- commit 30696bcbd0d5af3785ee4adf66a8602724febeb1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 22 12:30:00 2010 -0500 3.3.10-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7eb6924..a55a6b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,8 @@ - bug #3123433 [interface] Avoid double escaping of MySQL errors. - [interface] Use less noisy message and remove disable link on server charts and database statistics. +3.3.10.0 (not yet released) + 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-25-gabbbd19
by Marc Delisle 22 Dec '10

22 Dec '10

The branch, QA_3_3 has been updated via abbbd192bfd054545d53600bcbc06be3bce7fbf1 (commit) from 1ceccbd50cc0359ac2543e4283a70b2440752b59 (commit) - Log ----------------------------------------------------------------- commit abbbd192bfd054545d53600bcbc06be3bce7fbf1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 22 12:29:09 2010 -0500 3.3.10-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 988feaf..450f59a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.10.0 (not yet released) + 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand diff --git a/Documentation.html b/Documentation.html index fb2c226..a80487a 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,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.3.9-dev - Documentation</title> + <title>phpMyAdmin 3.3.10-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,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.3.9-dev + 3.3.10-dev Documentation </h1> </div> diff --git a/README b/README index 334d3dd..7849d82 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.9-dev - ----------------- + Version 3.3.10-dev + ------------------ http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ba4aeb8..8e3ff8b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.9-dev'); + $this->set('PMA_VERSION', '3.3.10-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index bf2e2da..f47cdab 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <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.3.9-dev - Official translators</title> + <title>phpMyAdmin 3.3.10-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.9-dev + 3.3.10-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_9, created. RELEASE_3_3_8-25-geaac45d
by Marc Delisle 22 Dec '10

22 Dec '10

The branch, MAINT_3_3_9 has been created at eaac45dfda2daa345edc5165b30bedea5a3f18a0 (commit) - Log ----------------------------------------------------------------- commit eaac45dfda2daa345edc5165b30bedea5a3f18a0 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 22 12:25:54 2010 -0500 3.3.9-rc1 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1020-geee76d6
by Dieter Adriaenssens 22 Dec '10

22 Dec '10

The branch, master has been updated via eee76d640b86b036f38fb0df3ed1aa22ca9503f6 (commit) via 1ceccbd50cc0359ac2543e4283a70b2440752b59 (commit) from bc38c410b80b60f030c6894d7ed3b7fe715233b7 (commit) - Log ----------------------------------------------------------------- commit eee76d640b86b036f38fb0df3ed1aa22ca9503f6 Merge: bc38c410b80b60f030c6894d7ed3b7fe715233b7 1ceccbd50cc0359ac2543e4283a70b2440752b59 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Wed Dec 22 16:01:02 2010 +0100 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index cc8cc75..f155b6f 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -503,7 +503,7 @@ function PMA_exportDBFooter($db) * Returns a stand-in CREATE definition to resolve view dependencies * * @param string the database name - * @param string the vew name + * @param string the view name * @param string the end of line sequence * * @return string resulting definition hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, export_xml, updated. RELEASE_3_4_0BETA1-12-g8757515
by Dieter Adriaenssens 22 Dec '10

22 Dec '10

The branch, export_xml has been updated via 87575151eecfb372b82379e10f5d8776617993ee (commit) from d0caeef254b67b70ed1243f1edeaa2c0f46418ce (commit) - Log ----------------------------------------------------------------- commit 87575151eecfb372b82379e10f5d8776617993ee Author: Aamir Khan <systemw0rm(a)users.sourceforge.net> Date: Wed Dec 22 15:59:44 2010 +0100 fix typo ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index cc8cc75..f155b6f 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -503,7 +503,7 @@ function PMA_exportDBFooter($db) * Returns a stand-in CREATE definition to resolve view dependencies * * @param string the database name - * @param string the vew name + * @param string the view name * @param string the end of line sequence * * @return string resulting definition hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-24-g1ceccbd
by Dieter Adriaenssens 22 Dec '10

22 Dec '10

The branch, QA_3_3 has been updated via 1ceccbd50cc0359ac2543e4283a70b2440752b59 (commit) from 8afdcbe2b89888b4e7e3ca58224cb01ebe8db73c (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index d026f2c..34ce6b0 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -440,7 +440,7 @@ function PMA_exportDBFooter($db) * Returns a stand-in CREATE definition to resolve view dependencies * * @param string the database name - * @param string the vew name + * @param string the view name * @param string the end of line sequence * * @return string resulting definition hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1018-gbc38c41
by Michal Čihař 22 Dec '10

22 Dec '10

The branch, master has been updated via bc38c410b80b60f030c6894d7ed3b7fe715233b7 (commit) via f5e7b92fc5f81ee74bcfc5e1a34d3a78dfe73430 (commit) from da6cf1b878401b3f509c9294d46864b0d6bd82dd (commit) - Log ----------------------------------------------------------------- commit bc38c410b80b60f030c6894d7ed3b7fe715233b7 Author: gilberto dos santos alves <gsavix(a)gmail.com> Date: Tue Dec 21 18:48:16 2010 +0200 Translation update done using Pootle. commit f5e7b92fc5f81ee74bcfc5e1a34d3a78dfe73430 Author: gilberto dos santos alves <gsavix(a)gmail.com> Date: Tue Dec 21 18:45:44 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 31 ++++--------------------------- 1 files changed, 4 insertions(+), 27 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index fe29ae4..4ed8fc1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-10-21 05:02+0200\n" -"Last-Translator: <fabiobucior(a)gmail.com>\n" +"PO-Revision-Date: 2010-12-21 18:48+0200\n" +"Last-Translator: gilberto dos santos alves <gsavix(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -99,10 +99,9 @@ msgid "No blob streaming server configured!" msgstr "" #: bs_disp_as_mime_type.php:35 -#, fuzzy #| msgid "Failed to write file to disk." msgid "Failed to fetch headers" -msgstr "Falhou ao salvar arquivo no disco." +msgstr "Falhou ao recuperar cabeçalhos." #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" @@ -132,7 +131,6 @@ msgstr "Comentários da tabela" #: tbl_change.php:300 tbl_indexes.php:187 tbl_printview.php:139 #: tbl_relation.php:399 tbl_select.php:132 tbl_structure.php:197 #: tbl_tracking.php:267 tbl_tracking.php:318 -#, fuzzy #| msgid "Column names" msgid "Column" msgstr "Nome das colunas" @@ -10040,24 +10038,3 @@ msgstr "Renomear a tabela para " #, fuzzy #~ msgid "Start" #~ msgstr "Sab" - -#, fuzzy -#~| msgid "Displaying Column Comments" -#~ msgid "Display table filter" -#~ msgstr "Exibindo comentários da coluna" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "Os recursos adicionais para trabalhar com tabelas linkadas foram " -#~ "desativadas. Para descobrir o motivo clique %saqui%s." - -#~ msgid "Ignore duplicate rows" -#~ msgstr "Ignorar linhas duplicadas" - -#~ msgid "Execute bookmarked query" -#~ msgstr "Executar consulta marcada" - -#~ msgid "No tables" -#~ msgstr "Sem tabelas" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, export_xml, updated. RELEASE_3_4_0BETA1-11-gd0caeef
by Dieter Adriaenssens 21 Dec '10

21 Dec '10

The branch, export_xml has been updated via d0caeef254b67b70ed1243f1edeaa2c0f46418ce (commit) from d03cf63a9fd29b12943b10520b860ca6eb13d2a5 (commit) - Log ----------------------------------------------------------------- commit d0caeef254b67b70ed1243f1edeaa2c0f46418ce Author: Aamir Khan <systemw0rm(a)users.sourceforge.net> Date: Tue Dec 21 16:48:44 2010 +0100 bug #3136658, xml export : functions/routines should be exported before tables/views ----------------------------------------------------------------------- Summary of changes: libraries/export/xml.php | 98 ++++++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 46 deletions(-) diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 073bb7d..58e3876 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -126,7 +126,59 @@ function PMA_exportHeader() { $head .= ' -->' . $crlf; $head .= ' <pma:structure_schemas>' . $crlf; $head .= ' <pma:database name="' . $db . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf; + + /***** Exporting functions first *****/ + + if (isset($GLOBALS[$what . '_export_functions']) && $GLOBALS[$what . '_export_functions']) { + // Export functions + $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION'); + if ($functions) { + foreach ($functions as $function) { + $head .= ' <pma:function name="' . $function . '">' . $crlf; + + // Do some formatting + $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function); + $sql = rtrim($sql); + $sql = " " . $sql; + $sql = str_replace("\n", "\n ", $sql); + + $head .= $sql . $crlf; + $head .= ' </pma:function>' . $crlf; + } + + unset($create_func); + unset($function); + unset($functions); + } + } + + /****** Exporting Procedures second ******/ + + if (isset($GLOBALS[$what . '_export_procedures']) && $GLOBALS[$what . '_export_procedures']) { + // Export procedures + $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); + if ($procedures) { + foreach ($procedures as $procedure) { + $head .= ' <pma:procedure name="' . $procedure . '">' . $crlf; + + // Do some formatting + $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure); + $sql = rtrim($sql); + $sql = " " . $sql; + $sql = str_replace("\n", "\n ", $sql); + + $head .= $sql . $crlf; + $head .= ' </pma:procedure>' . $crlf; + } + + unset($create_proc); + unset($procedure); + unset($procedures); + } + } + /****** Exporting Tables & views structure ******/ + if (count($tables) == 0) { $tables[] = $table; } @@ -183,52 +235,6 @@ function PMA_exportHeader() { } } - if (isset($GLOBALS[$what . '_export_functions']) && $GLOBALS[$what . '_export_functions']) { - // Export functions - $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION'); - if ($functions) { - foreach ($functions as $function) { - $head .= ' <pma:function name="' . $function . '">' . $crlf; - - // Do some formatting - $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function); - $sql = rtrim($sql); - $sql = " " . $sql; - $sql = str_replace("\n", "\n ", $sql); - - $head .= $sql . $crlf; - $head .= ' </pma:function>' . $crlf; - } - - unset($create_func); - unset($function); - unset($functions); - } - } - - if (isset($GLOBALS[$what . '_export_procedures']) && $GLOBALS[$what . '_export_procedures']) { - // Export procedures - $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); - if ($procedures) { - foreach ($procedures as $procedure) { - $head .= ' <pma:procedure name="' . $procedure . '">' . $crlf; - - // Do some formatting - $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure); - $sql = rtrim($sql); - $sql = " " . $sql; - $sql = str_replace("\n", "\n ", $sql); - - $head .= $sql . $crlf; - $head .= ' </pma:procedure>' . $crlf; - } - - unset($create_proc); - unset($procedure); - unset($procedures); - } - } - unset($result); $head .= ' </pma:database>' . $crlf; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1016-gda6cf1b
by Michal Čihař 21 Dec '10

21 Dec '10

The branch, master has been updated via da6cf1b878401b3f509c9294d46864b0d6bd82dd (commit) via 811068475e6a14d58322543f10df9d5e412ba4c0 (commit) via 54bd973683f064bcce92960a1019109a67419f3a (commit) via a86ef3446cc1c84e2f11cd21dd159bc6604b2275 (commit) from a4c225ebd40e761c19cbfebcde52e909f4d8b9a7 (commit) - Log ----------------------------------------------------------------- commit da6cf1b878401b3f509c9294d46864b0d6bd82dd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 21 13:26:13 2010 +0200 Translation update done using Pootle. commit 811068475e6a14d58322543f10df9d5e412ba4c0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 21 13:23:48 2010 +0200 Translation update done using Pootle. commit 54bd973683f064bcce92960a1019109a67419f3a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 21 13:23:07 2010 +0200 Translation update done using Pootle. commit a86ef3446cc1c84e2f11cd21dd159bc6604b2275 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 21 13:13:12 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index dfd3b51..5b68d02 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-17 01:17+0200\n" +"PO-Revision-Date: 2010-12-21 13:26+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1639,7 +1639,7 @@ msgstr "Sunucu Seçimi" #: libraries/auth/cookie.auth.lib.php:307 libraries/header.inc.php:72 msgid "Cookies must be enabled past this point." -msgstr "Bu kısmı geçmek için tanımlama bilgileri (cookies) açık olmalı." +msgstr "Bu kısmı geçmek için tanımlama bilgileri (cookies) açık olmalıdır." #: libraries/auth/cookie.auth.lib.php:639 #: libraries/auth/signon.auth.lib.php:180 @@ -3906,19 +3906,19 @@ msgstr "" #: libraries/config/messages.inc.php:432 msgid "Verbose check" -msgstr "Fazla bilgi kontrolü" +msgstr "Fazla bilgi denetimi" #: libraries/config/messages.inc.php:433 msgid "" "A user-friendly description of this server. Leave blank to display the " "hostname instead." msgstr "" -"Bu sunucunun anlaması kolay açıklaması. Anamakine yerine görüntülemek için " +"Bu sunucunun kolay kullanım açıklaması. Anamakine adını görüntülemek için " "boş bırakın." #: libraries/config/messages.inc.php:434 msgid "Verbose name of this server" -msgstr "Sunucunun fazladan adı" +msgstr "Bu sunucunun fazladan adı" #: libraries/config/messages.inc.php:435 msgid "Whether a user should be displayed a "show all (rows)" button" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1012-ga4c225e
by Marc Delisle 20 Dec '10

20 Dec '10

The branch, master has been updated via a4c225ebd40e761c19cbfebcde52e909f4d8b9a7 (commit) from 2dd20b23d8791a77901baab8f3e71492df339666 (commit) - Log ----------------------------------------------------------------- commit a4c225ebd40e761c19cbfebcde52e909f4d8b9a7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 20 12:59:00 2010 -0500 Reduce the name of this class ----------------------------------------------------------------------- Summary of changes: js/sql.js | 8 ++++---- libraries/display_tbl.lib.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/js/sql.js b/js/sql.js index 822c7e8..de01953 100644 --- a/js/sql.js +++ b/js/sql.js @@ -352,14 +352,14 @@ $(document).ready(function() { /** * @var $input_siblings Object referring to all inline editable events from same row */ - var $input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')'); + var $input_siblings = $(this).parents('tbody').find('tr').find('.inline_edit:nth('+this_row_index+')'); /** * @var where_clause String containing the WHERE clause to select this row */ var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val(); } else { - var $input_siblings = $(this).parent('tr').find('.data_inline_edit'); + var $input_siblings = $(this).parent('tr').find('.inline_edit'); var where_clause = $(this).parent('tr').find('.where_clause').val(); } @@ -513,14 +513,14 @@ $(document).ready(function() { /** * @var $input_siblings Object referring to all inline editable events from same row */ - var $input_siblings = $this_td.parents('tbody').find('tr').find('.data_inline_edit:nth('+this_td_index+')'); + var $input_siblings = $this_td.parents('tbody').find('tr').find('.inline_edit:nth('+this_td_index+')'); /** * @var where_clause String containing the WHERE clause to select this row */ var where_clause = $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').val(); } else { - var $input_siblings = $this_td.parent('tr').find('.data_inline_edit'); + var $input_siblings = $this_td.parent('tr').find('.inline_edit'); var where_clause = $this_td.parent('tr').find('.where_clause').val(); } diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 3e4844b..7bbd4d8 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1070,7 +1070,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['data'] = array(); $vertical_display['row_delete'] = array(); // name of the class added to all inline editable elements - $data_inline_edit_class = 'data_inline_edit'; + $inline_edit_class = 'inline_edit'; // Correction University of Virginia 19991216 in the while below // Previous code assumed that all tables have keys, specifically that @@ -1226,8 +1226,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $pointer = $i; $is_field_truncated = false; //If the previous column had blob data, we need to reset the class - // to $data_inline_edit_class - $class = 'data ' . $data_inline_edit_class . ' ' . $alternating_color_class; + // to $inline_edit_class + $class = 'data ' . $inline_edit_class . ' ' . $alternating_color_class; // See if this column should get highlight because it's used in the // where-query. @@ -1312,7 +1312,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // TEXT fields type so we have to ensure it's really a BLOB $field_flags = PMA_DBI_field_flags($dt_result, $i); - // reset $class from $data_inline_edit_class to just 'data' + // reset $class from $inline_edit_class to just 'data' // as we can't edit binary data $class = 'data'; @@ -1353,7 +1353,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // g e o m e t r y } elseif ($meta->type == 'geometry') { $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta); - // reset $class from $data_inline_edit_class to 'data' + // reset $class from $inline_edit_class to 'data' // as we can't edit geometry data $class = 'data'; $vertical_display['data'][$row_no][$i] = PMA_buildValueDisplay($class, $condition_field, $geometry_text); hooks/post-receive -- phpMyAdmin

1 0