Update Kirby and Composer dependencies
This commit is contained in:
parent
f5d3ea5e84
commit
ec74d78ba9
382 changed files with 25077 additions and 4955 deletions
|
@ -17,7 +17,7 @@ class ParsedownExtra extends Parsedown
|
|||
{
|
||||
# ~
|
||||
|
||||
const version = '0.8.0-beta-1';
|
||||
public const version = '0.8.0-beta-1';
|
||||
|
||||
# ~
|
||||
|
||||
|
@ -568,11 +568,11 @@ class ParsedownExtra extends Parsedown
|
|||
# http://stackoverflow.com/q/1148928/200145
|
||||
libxml_use_internal_errors(true);
|
||||
|
||||
$DOMDocument = new DOMDocument;
|
||||
$DOMDocument = new DOMDocument();
|
||||
|
||||
# http://stackoverflow.com/q/11309194/200145
|
||||
$elementMarkup = mb_convert_encoding($elementMarkup, 'HTML-ENTITIES', 'UTF-8');
|
||||
|
||||
|
||||
# Ensure that saveHTML() is not remove new line characters. New lines will be split by this character.
|
||||
$DOMDocument->formatOutput = true;
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ class Parsedown
|
|||
{
|
||||
# ~
|
||||
|
||||
const version = '1.8.0-beta-7';
|
||||
public const version = '1.8.0-beta-7';
|
||||
|
||||
# ~
|
||||
|
||||
|
@ -207,11 +207,9 @@ class Parsedown
|
|||
$CurrentBlock = $Block;
|
||||
|
||||
continue;
|
||||
} else {
|
||||
if ($this->isBlockCompletable($CurrentBlock['type'])) {
|
||||
$methodName = 'block' . $CurrentBlock['type'] . 'Complete';
|
||||
$CurrentBlock = $this->$methodName($CurrentBlock);
|
||||
}
|
||||
} elseif ($this->isBlockCompletable($CurrentBlock['type'])) {
|
||||
$methodName = 'block' . $CurrentBlock['type'] . 'Complete';
|
||||
$CurrentBlock = $this->$methodName($CurrentBlock);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1597,12 +1595,10 @@ class Parsedown
|
|||
$markup .= $this->elements($Element['elements']);
|
||||
} elseif (isset($Element['element'])) {
|
||||
$markup .= $this->element($Element['element']);
|
||||
} elseif (!$permitRawHtml) {
|
||||
$markup .= self::escape($text, true);
|
||||
} else {
|
||||
if (!$permitRawHtml) {
|
||||
$markup .= self::escape($text, true);
|
||||
} else {
|
||||
$markup .= $text;
|
||||
}
|
||||
$markup .= $text;
|
||||
}
|
||||
|
||||
$markup .= $hasName ? '</' . $Element['name'] . '>' : '';
|
||||
|
|
21
kirby/dependencies/spyc/COPYING
Normal file
21
kirby/dependencies/spyc/COPYING
Normal file
|
@ -0,0 +1,21 @@
|
|||
The MIT License
|
||||
|
||||
Copyright (c) 2011 Vladimir Andersen
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
1196
kirby/dependencies/spyc/Spyc.php
Normal file
1196
kirby/dependencies/spyc/Spyc.php
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue