Git October 2011

git@phpmyadmin.net

6 participants
164 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_7, created. RELEASE_3_4_7

by Marc Delisle

The annotated tag, RELEASE_3_4_7 has been created at 06d0fecb480bea953555a2dea5f11e979a3c3368 (tag) tagging a8a93c3e5af85dd0329e1a71b8bed664c9ec4bc2 (commit) replaces RELEASE_3_4_7RC1 tagged by Marc Delisle on Sun Oct 23 08:17:42 2011 -0400 - Log ----------------------------------------------------------------- Released 3.4.7 Marc Delisle (1): 3.4.7 ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7RC1-21391-gc067410

by Marc Delisle

The branch, master has been updated via c0674103719c6b50e9d5abebf03ab70d3cb562b3 (commit) via d590bccda2409f3d1e168c470a6af3fe38531106 (commit) via bdfd9ead762a3003dcbdbb043a3288bfe1f1eecc (commit) via a8a93c3e5af85dd0329e1a71b8bed664c9ec4bc2 (commit) via fd82f1d12c2915c9045de0bfdc440581738eaebd (commit) from 0683bd485b73bb8297da67fa66f7a095b32e7231 (commit) - Log ----------------------------------------------------------------- commit c0674103719c6b50e9d5abebf03ab70d3cb562b3 Merge: 0683bd4 d590bcc Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 23 08:11:23 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4bc408..8cbadcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,7 +56,7 @@ phpMyAdmin - ChangeLog - bug #3425230 [interface] enum data split at space char (more space to edit) - bug #3426840 [interface] ENUM/SET editor can't handle commas in values -3.4.7.0 (not yet released) +3.4.7.0 (2011-10-23) - 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 hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7RC1-6-gd590bcc

by Marc Delisle

The branch, QA_3_4 has been updated via d590bccda2409f3d1e168c470a6af3fe38531106 (commit) via bdfd9ead762a3003dcbdbb043a3288bfe1f1eecc (commit) via a8a93c3e5af85dd0329e1a71b8bed664c9ec4bc2 (commit) via fd82f1d12c2915c9045de0bfdc440581738eaebd (commit) from 0112ff6ba522b6d18fee298357a3fda1d9cea0cf (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef1517b..7b7f26f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog - bug #3425230 [interface] enum data split at space char (more space to edit) - bug #3426840 [interface] ENUM/SET editor can't handle commas in values -3.4.7.0 (not yet released) +3.4.7.0 (2011-10-23) - 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 hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_7, updated. RELEASE_3_4_7RC1-1-ga8a93c3

by Marc Delisle

The branch, MAINT_3_4_7 has been updated via a8a93c3e5af85dd0329e1a71b8bed664c9ec4bc2 (commit) from fd82f1d12c2915c9045de0bfdc440581738eaebd (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 3ae9857..834215c 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.7-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.7 - 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.7-rc1 + 3.4.7 Documentation </h1> </div> diff --git a/README b/README index e4da810..ae117eb 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.7-rc1 +Version 3.4.7 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 589e2f5..824d04c 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.7-rc1'); + $this->set('PMA_VERSION', '3.4.7'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6-21410-g0683bd4

by Rouslan Placella

The branch, master has been updated via 0683bd485b73bb8297da67fa66f7a095b32e7231 (commit) via 0112ff6ba522b6d18fee298357a3fda1d9cea0cf (commit) from 20a57d1feaf48102c768ca678b695ba06ac3f340 (commit) - Log ----------------------------------------------------------------- commit 0683bd485b73bb8297da67fa66f7a095b32e7231 Merge: 20a57d1 0112ff6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Oct 21 15:40:58 2011 +0100 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 58 ++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index c59a9f0..b4bc408 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) +- bug #3426840 [interface] ENUM/SET editor can't handle commas in values 3.4.7.0 (not yet released) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/functions.js b/js/functions.js index d39e387..dcd8f0f 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2609,24 +2609,48 @@ $(document).ready(function() { var h3_text = $("#enum_editor h3").html(); $("#enum_editor h3").html(h3_text.split('"')[0]+'"'+column_name+'"'); - // Get the values - var values = $(this).parent().prev("input").attr("value").split(","); - $.each(values, function(index, val) { - if(jQuery.trim(val) != "") { - // enclose the string in single quotes if it's not already - if(val.substr(0, 1) != "'") { - val = "'" + val; - } - if(val.substr(val.length-1, val.length) != "'") { - val = val + "'"; - } - // escape the single quotes, except the mandatory ones enclosing the entire string - val = val.substr(1, val.length-2).replace(/''/g, "'").replace(/\\\\/g, '\\').replace(/\\'/g, "'").replace(/'/g, "'"); - // escape the greater-than symbol - val = val.replace(/>/g, ">"); - $("#enum_editor #values").append("<input type='text' value='" + val + "' />"); + // Get the values as a string + var inputstring = $(this) + .parent() + .prev("input") + .val(); + // Escape html entities + inputstring = $('<div/>') + .text(inputstring) + .html(); + // Parse the values, escaping quotes and + // slashes on the fly, into an array + var values = []; + var in_string = false; + var curr, next, buffer = ''; + for (var i=0; i<inputstring.length; i++) { + curr = inputstring.charAt(i); + next = i == inputstring.length ? '' : inputstring.charAt(i+1); + if (! in_string && curr == "'") { + in_string = true; + } else if (in_string && curr == "\\" && next == "\\") { + buffer += "\"; + i++; + } else if (in_string && next == "'" && (curr == "'" || curr == "\\")) { + buffer += "'"; + i++; + } else if (in_string && curr == "'") { + in_string = false; + values.push(buffer); + buffer = ''; + } else if (in_string) { + buffer += curr; } - }); + } + if (buffer.length > 0) { + values.push(buffer); + } + // Add the parsed values to the editor + for (var i=0; i<values.length; i++) { + $("#enum_editor #values").append( + "<input type='text' value='" + values[i] + "' />" + ); + } // So we know which column's data is being edited $("#enum_editor").append("<input type='hidden' value='" + $(this).parent().prev("input").attr("id") + "' />"); return false; hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6-26-g0112ff6

by Rouslan Placella

The branch, QA_3_4 has been updated via 0112ff6ba522b6d18fee298357a3fda1d9cea0cf (commit) from d4cce87b263ed00654588fa068c7ec73422fd465 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 58 ++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a2d9e3..ef1517b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) +- bug #3426840 [interface] ENUM/SET editor can't handle commas in values 3.4.7.0 (not yet released) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/functions.js b/js/functions.js index 3a1ed33..8431b2a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1842,24 +1842,48 @@ $(document).ready(function() { $("#popup_background").fadeIn("fast"); $("#enum_editor").fadeIn("fast"); - // Get the values - var values = $(this).parent().prev("input").attr("value").split(","); - $.each(values, function(index, val) { - if(jQuery.trim(val) != "") { - // enclose the string in single quotes if it's not already - if(val.substr(0, 1) != "'") { - val = "'" + val; - } - if(val.substr(val.length-1, val.length) != "'") { - val = val + "'"; - } - // escape the single quotes, except the mandatory ones enclosing the entire string - val = val.substr(1, val.length-2).replace(/''/g, "'").replace(/\\\\/g, '\\').replace(/\\'/g, "'").replace(/'/g, "'"); - // escape the greater-than symbol - val = val.replace(/>/g, ">"); - $("#enum_editor #values").append("<input type='text' value='" + val + "' />"); + // Get the values as a string + var inputstring = $(this) + .parent() + .prev("input") + .val(); + // Escape html entities + inputstring = $('<div/>') + .text(inputstring) + .html(); + // Parse the values, escaping quotes and + // slashes on the fly, into an array + var values = []; + var in_string = false; + var curr, next, buffer = ''; + for (var i=0; i<inputstring.length; i++) { + curr = inputstring.charAt(i); + next = i == inputstring.length ? '' : inputstring.charAt(i+1); + if (! in_string && curr == "'") { + in_string = true; + } else if (in_string && curr == "\\" && next == "\\") { + buffer += "\"; + i++; + } else if (in_string && next == "'" && (curr == "'" || curr == "\\")) { + buffer += "'"; + i++; + } else if (in_string && curr == "'") { + in_string = false; + values.push(buffer); + buffer = ''; + } else if (in_string) { + buffer += curr; } - }); + } + if (buffer.length > 0) { + values.push(buffer); + } + // Add the parsed values to the editor + for (var i=0; i<values.length; i++) { + $("#enum_editor #values").append( + "<input type='text' value='" + values[i] + "' />" + ); + } // So we know which column's data is being edited $("#enum_editor").append("<input type='hidden' value='" + $(this).parent().prev("input").attr("id") + "' />"); return false; hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6-21408-g20a57d1

by Rouslan Placella

The branch, master has been updated via 20a57d1feaf48102c768ca678b695ba06ac3f340 (commit) via d4cce87b263ed00654588fa068c7ec73422fd465 (commit) via a3132f6e91f04dc8f885f4141e6d397460421fa4 (commit) from 4cba6ee2dc7350d313441ed64c8706df3408f5a1 (commit) - Log ----------------------------------------------------------------- commit 20a57d1feaf48102c768ca678b695ba06ac3f340 Merge: 4cba6ee d4cce87 Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Oct 21 11:38:38 2011 +0100 Merge branch 'QA_3_4' Conflicts: ChangeLog Documentation.html README libraries/Config.class.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cc4ab1..c59a9f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ phpMyAdmin - ChangeLog - bug #3299486 [prettyprint] Order By in a query containing comment character 3.4.8.0 (not yet released) +- bug #3425230 [interface] enum data split at space char (more space to edit) 3.4.7.0 (not yet released) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/functions.js b/js/functions.js index 19ab7ce..d39e387 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2624,7 +2624,7 @@ $(document).ready(function() { val = val.substr(1, val.length-2).replace(/''/g, "'").replace(/\\\\/g, '\\').replace(/\\'/g, "'").replace(/'/g, "'"); // escape the greater-than symbol val = val.replace(/>/g, ">"); - $("#enum_editor #values").append("<input type='text' value=" + val + " />"); + $("#enum_editor #values").append("<input type='text' value='" + val + "' />"); } }); // So we know which column's data is being edited hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6-25-gd4cce87

by Rouslan Placella

The branch, QA_3_4 has been updated via d4cce87b263ed00654588fa068c7ec73422fd465 (commit) from a3132f6e91f04dc8f885f4141e6d397460421fa4 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2660fd8..6a2d9e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 3.4.8.0 (not yet released) +- bug #3425230 [interface] enum data split at space char (more space to edit) 3.4.7.0 (not yet released) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/functions.js b/js/functions.js index b076661..3a1ed33 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1857,7 +1857,7 @@ $(document).ready(function() { val = val.substr(1, val.length-2).replace(/''/g, "'").replace(/\\\\/g, '\\').replace(/\\'/g, "'").replace(/'/g, "'"); // escape the greater-than symbol val = val.replace(/>/g, ">"); - $("#enum_editor #values").append("<input type='text' value=" + val + " />"); + $("#enum_editor #values").append("<input type='text' value='" + val + "' />"); } }); // So we know which column's data is being edited hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_7RC1, created. RELEASE_3_4_7RC1

by Marc Delisle

The annotated tag, RELEASE_3_4_7RC1 has been created at 10a83e9c14bbd5bc5357b3c77f92151dafbe5609 (tag) tagging fd82f1d12c2915c9045de0bfdc440581738eaebd (commit) replaces RELEASE_3_4_6 tagged by Marc Delisle on Wed Oct 19 17:05:56 2011 -0400 - Log ----------------------------------------------------------------- Released 3.4.7-rc1 Dieter Adriaenssens (2): Fixed local path disclosure vulnerability, see PMASA-2011-15 Merge branch 'MAINT_3_4_6' into QA_3_4 Madhura Jayaratne (6): bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false bug #3418849 [interface] Inline edit shows dropdowns even after closing Typo Avoid warnings on undefined variables Proper layout for table maintenance page bug #3423725 [pdf] Broken PDF file when exporting database to PDF Marc Delisle (10): 3.4.7-dev is starting Merge branch 'MAINT_3_4_6' into QA_3_4 Merge branch 'MAINT_3_4_6' into QA_3_4 bug [view] View renaming did not work bug [navi] Wrong icon for view (MySQL 5.5) bug #3420229 [doc] Missing documentation section Merge branch 'MAINT_3_4_6' into QA_3_4 3.4.6 release bug #3426031 [export] Export to bzip2 is not working 3.4.7-rc1 Michal Čihař (6): Update po files Update translations from master [core] Allow to set language in URL PMA_getPHPDocLink can be used from fatal errors early in execution, where gettext is not yet loaded PMA_linkURL can be used from fatal errors early in execution, where library is not yet loaded bug #3425184 [doc] Fix links to PHP documentation ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

12 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6-21405-g4cba6ee

by Marc Delisle

The branch, master has been updated via 4cba6ee2dc7350d313441ed64c8706df3408f5a1 (commit) from 9db5e4447c9249a92ca3283d452513c10d79a380 (commit) - Log ----------------------------------------------------------------- commit 4cba6ee2dc7350d313441ed64c8706df3408f5a1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Oct 19 16:58:54 2011 -0400 3.4.8-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e266b7..0cc4ab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,8 @@ phpMyAdmin - ChangeLog + [interface] Remove DefaultPropDisplay feature - bug #3299486 [prettyprint] Order By in a query containing comment character +3.4.8.0 (not yet released) + 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 hooks/post-receive -- phpMyAdmin

12 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git October 2011