Permalink
Browse files

Merge branch 'master' into extra

Conflicts:

	PHP Markdown Extra Readme.text
	markdown.php
  • Loading branch information...
2 parents eb6da23 + 12b7706 commit 6a859ece00e23f2b3a9b6248b24dedcf8d7ccba4 @michelf committed Sep 26, 2007
Showing with 15 additions and 9 deletions.
  1. +11 −5 PHP Markdown Extra Readme.text
  2. +4 −4 markdown.php
@@ -1,7 +1,7 @@
PHP Markdown Extra
==================
-Version 1.1.6 - Tue 4 Sep 2007
+Version 1.1.7 - Wed 26 Sep 2007
by Michel Fortin
<http://www.michelf.com/>
@@ -41,10 +41,7 @@ PHP Markdown requires PHP version 4.0.5 or later.
### WordPress ###
-PHP Markdown works with [WordPress][wp], version 1.2 or later.
-PHP Markdown is already bundled with WordPress. Still, you can find
-here the latest version that may be newer than the latest WordPress
-version.
+PHP Markdown works with [WordPress][wp], version 1.2 or later.
[wp]: http://wordpress.org/
@@ -207,6 +204,15 @@ expected; (3) the output PHP Markdown actually produced.
Version History
---------------
+Extra 1.1.7 (26 Sep 2007):
+
+1.0.1k (26 Sep 2007):
+
+* Fixed a problem introduced in 1.0.1i where three or more identical
+ uppercase letters, as well as a few other symbols, would trigger
+ a horizontal line.
+
+
Extra 1.1.6 (4 Sep 2007):
1.0.1j (4 Sep 2007):
View
@@ -12,8 +12,8 @@
#
-define( 'MARKDOWN_VERSION', "1.0.1j" ); # Tue 4 Sep 2007
-define( 'MARKDOWNEXTRA_VERSION', "1.1.6" ); # Tue 4 Sep 2007
+define( 'MARKDOWN_VERSION', "1.0.1k" ); # Wed 26 Sep 2007
+define( 'MARKDOWNEXTRA_VERSION', "1.1.7" ); # Wed 26 Sep 2007
#
@@ -71,7 +71,7 @@ function Markdown($text) {
Plugin Name: Markdown Extra
Plugin URI: http://www.michelf.com/projects/php-markdown/
Description: <a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://www.michelf.com/projects/php-markdown/">More...</a>
-Version: 1.1.6
+Version: 1.1.7
Author: Michel Fortin
Author URI: http://www.michelf.com/
*/
@@ -563,7 +563,7 @@ function doHorizontalRules($text) {
return preg_replace(
'{
^[ ]{0,3} # Leading space
- ([*-_]) # $1: First marker
+ ([-*_]) # $1: First marker
(?> # Repeated marker group
[ ]{0,2} # Zero, one, or two spaces.
\1 # Marker character

0 comments on commit 6a859ec

Please sign in to comment.