mirror of
https://github.com/sbrl/Pepperminty-Wiki.git
synced 2024-12-23 01:55:01 +00:00
Fix strange conflict
This commit is contained in:
commit
d887c80f32
3 changed files with 3 additions and 5 deletions
|
@ -3835,8 +3835,7 @@ class PeppermintParsedown extends ParsedownExtra
|
|||
array_unshift($this->InlineTypes["!"], "ExtendedImage");
|
||||
|
||||
$this->inlineMarkerList .= "{";
|
||||
if(!isset($this->InlineTypes["{"]) or
|
||||
!is_array($this->InlineTypes["{"]))
|
||||
if(!isset($this->InlineTypes["{"]) or !is_array($this->InlineTypes["{"]))
|
||||
$this->InlineTypes["{"] = [];
|
||||
$this->InlineTypes["{"][] = "Template";
|
||||
}
|
||||
|
|
|
@ -194,7 +194,7 @@
|
|||
"author": "Emanuil Rusev & Starbeamrainbowlabs",
|
||||
"description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds a some weight to your installation, and also *requires* write access to the disk on first load.",
|
||||
"id": "parser-parsedown",
|
||||
"lastupdate": 1458928368,
|
||||
"lastupdate": 1459172723,
|
||||
"optional": false
|
||||
}
|
||||
]
|
|
@ -77,8 +77,7 @@ class PeppermintParsedown extends ParsedownExtra
|
|||
array_unshift($this->InlineTypes["!"], "ExtendedImage");
|
||||
|
||||
$this->inlineMarkerList .= "{";
|
||||
if(!isset($this->InlineTypes["{"]) or
|
||||
!is_array($this->InlineTypes["{"]))
|
||||
if(!isset($this->InlineTypes["{"]) or !is_array($this->InlineTypes["{"]))
|
||||
$this->InlineTypes["{"] = [];
|
||||
$this->InlineTypes["{"][] = "Template";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue