sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 16:33:00 +00:00
Code Activity

Bugfix: Images with captions didn't float correctly.

Browse source
This commit is contained in:
Starbeamrainbowlabs 2018-04-05 09:47:29 +01:00
parent ef719c671e
commit 7a243215ec
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -20,6 +20,7 @@ This file holds the changelog for Pepperminty Wiki. This is the master list of t
- Normalise utf8 text to avoid duplicate ids and missing search results. - Normalise utf8 text to avoid duplicate ids and missing search results.
- Improved handling of mime types in some places in the API. - Improved handling of mime types in some places in the API.
- Added `minified` option to `status` action to reduce data usage slightly - Added `minified` option to `status` action to reduce data usage slightly
- Fixed floating images that have captions
- [Rest API] Fix `checklogin` action documentation - [Rest API] Fix `checklogin` action documentation
- Fix link on credits page - Fix link on credits page

3
build/index.php
View file

@ -8433,8 +8433,7 @@ class PeppermintParsedown extends ParsedownExtra
if($imageCaption) if($imageCaption)
{ {
//$rawStyle = $result["element"]["attributes"]["style"] ?? ""; $rawStyle = $result["element"]["text"][0]["attributes"]["style"];
$rawStyle = $result["element"]["attributes"]["style"];
$containerStyle = preg_replace('/^.*float/', "float", $rawStyle); $containerStyle = preg_replace('/^.*float/', "float", $rawStyle);
$mediaStyle = preg_replace('/\s*float.*;/', "", $rawStyle); $mediaStyle = preg_replace('/\s*float.*;/', "", $rawStyle);
$result["element"] = [ $result["element"] = [

2
module_index.json
View file

@ -266,7 +266,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 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 some weight to your installation, and also *requires* write access to the disk on first load.",
"id": "parser-parsedown", "id": "parser-parsedown",
"lastupdate": 1517750660, "lastupdate": 1522917987,
"optional": false "optional": false
} }
] ]

3
modules/parser-parsedown.php
View file

@ -598,8 +598,7 @@ class PeppermintParsedown extends ParsedownExtra
if($imageCaption) if($imageCaption)
{ {
//$rawStyle = $result["element"]["attributes"]["style"] ?? ""; $rawStyle = $result["element"]["text"][0]["attributes"]["style"];
$rawStyle = $result["element"]["attributes"]["style"];
$containerStyle = preg_replace('/^.*float/', "float", $rawStyle); $containerStyle = preg_replace('/^.*float/', "float", $rawStyle);
$mediaStyle = preg_replace('/\s*float.*;/', "", $rawStyle); $mediaStyle = preg_replace('/\s*float.*;/', "", $rawStyle);
$result["element"] = [ $result["element"] = [