sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-26 05:32:59 +00:00
Code Activity

Fix strange conflict

Browse source
This commit is contained in:
Starbeamrainbowlabs 2016-03-28 14:45:52 +01:00
commit d887c80f32
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/index.php
View file

@ -3835,8 +3835,7 @@ class PeppermintParsedown extends ParsedownExtra
array_unshift($this->InlineTypes["!"], "ExtendedImage"); array_unshift($this->InlineTypes["!"], "ExtendedImage");
$this->inlineMarkerList .= "{"; $this->inlineMarkerList .= "{";
if(!isset($this->InlineTypes["{"]) or if(!isset($this->InlineTypes["{"]) or !is_array($this->InlineTypes["{"]))
!is_array($this->InlineTypes["{"]))
$this->InlineTypes["{"] = []; $this->InlineTypes["{"] = [];
$this->InlineTypes["{"][] = "Template"; $this->InlineTypes["{"][] = "Template";
} }

2
module_index.json
View file

@ -194,7 +194,7 @@
"author": "Emanuil Rusev & Starbeamrainbowlabs", "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.", "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", "id": "parser-parsedown",
"lastupdate": 1458928368, "lastupdate": 1459172723,
"optional": false "optional": false
} }
] ]

3
modules/parser-parsedown.php
View file

@ -77,8 +77,7 @@ class PeppermintParsedown extends ParsedownExtra
array_unshift($this->InlineTypes["!"], "ExtendedImage"); array_unshift($this->InlineTypes["!"], "ExtendedImage");
$this->inlineMarkerList .= "{"; $this->inlineMarkerList .= "{";
if(!isset($this->InlineTypes["{"]) or if(!isset($this->InlineTypes["{"]) or !is_array($this->InlineTypes["{"]))
!is_array($this->InlineTypes["{"]))
$this->InlineTypes["{"] = []; $this->InlineTypes["{"] = [];
$this->InlineTypes["{"][] = "Template"; $this->InlineTypes["{"][] = "Template";
} }