Zander/zanders-php-markdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into extra

Browse source 
Conflicts:
	PHP Markdown Extra Readme.text
	markdown.php
This commit is contained in:
Michel Fortin 2009-10-10 08:04:37 -04:00
commit 7e3c55edb7
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
License.text
View file

@ -1,6 +1,6 @@
PHP Markdown & Extra
Copyright (c) 2004-2009 Michel Fortin
<http://www.michelf.com/>
<http://michelf.com/>
All rights reserved.
Based on Markdown

8
PHP Markdown Extra Readme.text
View file

@ -4,7 +4,7 @@ PHP Markdown Extra
Version 1.2.3 - Wed 31 Dec 2008
by Michel Fortin
<http://www.michelf.com/>
<http://michelf.com/>
based on Markdown by John Gruber
<http://daringfireball.net/>
@ -14,7 +14,7 @@ Introduction
------------
This is a special version of PHP Markdown with extra features. See
<http://www.michelf.com/projects/php-markdown/extra/> for details.
<http://michelf.com/projects/php-markdown/extra/> for details.
Markdown is a text-to-HTML conversion tool for web writers. Markdown
allows you to write using an easy-to-read, easy-to-write plain text
@ -113,7 +113,7 @@ can solve this problem by installing the "smartypants.php" file from
Compatibility Mode function will use SmartyPants automatically without
further modification.
[psp]: http://www.michelf.com/projects/php-smartypants/
[psp]: http://michelf.com/projects/php-smartypants/
### In Your Own Programs ###
@ -747,7 +747,7 @@ Copyright and License
PHP Markdown & Extra
Copyright (c) 2004-2009 Michel Fortin
<http://www.michelf.com/>
<http://michelf.com/>
All rights reserved.
Based on Markdown

14
markdown.php
View file

@ -4,7 +4,7 @@
#
# PHP Markdown & Extra
# Copyright (c) 2004-2009 Michel Fortin
# <http://www.michelf.com/projects/php-markdown/>
# <http://michelf.com/projects/php-markdown/>
#
# Original Markdown
# Copyright (c) 2004-2006 John Gruber
@ -69,16 +69,16 @@ 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>
Plugin URI: http://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://michelf.com/projects/php-markdown/">More...</a>
Version: 1.2.3
Author: Michel Fortin
Author URI: http://www.michelf.com/
Author URI: http://michelf.com/
*/
if (isset($wp_version)) {
# More details about how it works here:
# <http://www.michelf.com/weblog/2005/wordpress-text-flow-vs-markdown/>
# <http://michelf.com/weblog/2005/wordpress-text-flow-vs-markdown/>
# Post content and excerpts
# - Remove WordPress paragraph generator.
@ -171,7 +171,7 @@ function identify_modifier_markdown() {
'authors' => 'Michel Fortin and John Gruber',
'licence' => 'GPL',
'version' => MARKDOWNEXTRA_VERSION,
'help' => '<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>',
'help' => '<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://michelf.com/projects/php-markdown/">More...</a>',
);
}
@ -2893,7 +2893,7 @@ Copyright and License
PHP Markdown & Extra
Copyright (c) 2004-2009 Michel Fortin
<http://www.michelf.com/>
<http://michelf.com/>
All rights reserved.
Based on Markdown