From 91e8734e79100d30c89c19c2a1e592c45ecb6764 Mon Sep 17 00:00:00 2001 From: Michel Fortin Date: Thu, 11 Apr 2013 14:06:48 -0400 Subject: [PATCH 1/2] Bumped version number to 1.0.1q and added some version history. --- PHP Markdown Readme.text | 9 ++++++++- markdown.php | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/PHP Markdown Readme.text b/PHP Markdown Readme.text index 3759e6d..405e46f 100644 --- a/PHP Markdown Readme.text +++ b/PHP Markdown Readme.text @@ -1,7 +1,7 @@ PHP Markdown ============ -Version 1.0.1p - Sun 13 Jan 2013 +Version 1.0.1p - 11 Apr 2013 by Michel Fortin @@ -191,6 +191,13 @@ See Installation and Requirement above for details. Version History --------------- +1.0.1q (11 Apr 2013): + +* Fixed a small mistake that could cause the parser to retain an invalid + state related to parsing links across multiple runs. This was never + observed (that I know of), but it's still worth fixing. + + 1.0.1p (13 Jan 2013): * Fixed an issue where some XML-style empty tags (such as `
`) were not diff --git a/markdown.php b/markdown.php index 070a6ac..17e5152 100644 --- a/markdown.php +++ b/markdown.php @@ -12,7 +12,7 @@ # -define( 'MARKDOWN_VERSION', "1.0.1p" ); # Sun 13 Jan 2013 +define( 'MARKDOWN_VERSION', "1.0.1q" ); # 11 Apr 2013 # @@ -62,7 +62,7 @@ function Markdown($text) { Plugin Name: Markdown Plugin URI: http://michelf.ca/projects/php-markdown/ Description: Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More... -Version: 1.0.1p +Version: 1.0.1q Author: Michel Fortin Author URI: http://michelf.ca/ */ From 2838fb7dd838a39634de7066a35e0858add91d3c Mon Sep 17 00:00:00 2001 From: Michel Fortin Date: Thu, 11 Apr 2013 14:10:33 -0400 Subject: [PATCH 2/2] Bumped version of Extra to 1.2.7. --- PHP Markdown Extra Readme.text | 9 +++------ markdown.php | 8 ++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/PHP Markdown Extra Readme.text b/PHP Markdown Extra Readme.text index 25b981b..1e8c811 100644 --- a/PHP Markdown Extra Readme.text +++ b/PHP Markdown Extra Readme.text @@ -1,11 +1,7 @@ PHP Markdown Extra ================== -<<<<<<< HEAD:PHP Markdown Extra Readme.text -Version 1.2.6 - Sun 13 Jan 2013 -======= -Version 1.0.1p - 11 Apr 2013 ->>>>>>> master:PHP Markdown Readme.text +Version 1.2.7 - 11 Apr 2013 by Michel Fortin @@ -199,7 +195,7 @@ See Installation and Requirement above for details. Version History --------------- -Current Extra: +Extra 1.2.7 (11 Apr 2013): * Added optional class and id attributes to images and links using the same syntax as for headers: @@ -218,6 +214,7 @@ Current Extra: * Fixed a PHP notice message triggered when some table column separator markers are missing on the separator line below column headers. + 1.0.1q (11 Apr 2013): * Fixed a small mistake that could cause the parser to retain an invalid diff --git a/markdown.php b/markdown.php index f972fd9..19094d6 100644 --- a/markdown.php +++ b/markdown.php @@ -13,7 +13,7 @@ define( 'MARKDOWN_VERSION', "1.0.11" ); # 11 Apr 2013 -define( 'MARKDOWNEXTRA_VERSION', "1.2.6" ); # 11 Apr 2013 +define( 'MARKDOWNEXTRA_VERSION', "1.2.7" ); # 11 Apr 2013 # @@ -79,11 +79,7 @@ Plugin Name: Markdown Extra Plugin Name: Markdown Plugin URI: http://michelf.ca/projects/php-markdown/ Description: Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More... -<<<<<<< HEAD -Version: 1.2.6 -======= -Version: 1.0.1q ->>>>>>> master +Version: 1.2.7 Author: Michel Fortin Author URI: http://michelf.ca/ */