diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-06-18 19:56:33 -0400 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-06-18 19:56:33 -0400 |
| commit | ec7b94a64aef23b85866ecdac8e8acc712d29bb6 (patch) | |
| tree | a108205c3fa0b694d8ce0ebaafd259480d6b530a /vendors/markdown/markdown.php | |
| parent | c80ba5aa03264dd64c20ed8ae222e87f9371a44d (diff) | |
| parent | 2b68a4d217c35a5587c462620789493cf2804ba2 (diff) | |
| download | elgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.gz elgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'vendors/markdown/markdown.php')
| -rwxr-xr-x | vendors/markdown/markdown.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendors/markdown/markdown.php b/vendors/markdown/markdown.php index ee3dddbf9..3f1f3a715 100755 --- a/vendors/markdown/markdown.php +++ b/vendors/markdown/markdown.php @@ -2246,12 +2246,13 @@ class MarkdownExtra_Parser extends Markdown_Parser { # ... # ###### Header 6 {#header2} # + # @note Added for Elgg: You can use = in place of hashes for atx-style. $text = preg_replace_callback('{ - ^(\#{1,6}) # $1 = string of #\'s + ^([\#=]{1,6}) # $1 = string of #\'s [ ]* (.+?) # $2 = Header text [ ]* - \#* # optional closing #\'s (not counted) + [\#=]* # optional closing #\'s (not counted) (?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute [ ]* \n+ |