sbrl-github/Pepperminty-Wiki
sbrl-github
/
Pepperminty-Wiki
mirror of https://github.com/sbrl/Pepperminty-Wiki.git
1
0
Fork 0
Code

Add default param to errorimage()

This commit is contained in:
Starbeamrainbowlabs 2017-04-17 12:44:27 +01:00
parent 6079fe43b5
commit dac4684c14
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.md
View File

@ -1,5 +1,10 @@
# Changelog # Changelog
## v0.14-dev
### Fixed
- Fixed error image generation in the image previewer under certain conditions.
## v0.13 ## v0.13
(No changes were made between the last beta release and this release) (No changes were made between the last beta release and this release)

2
build/index.php
View File

@ -3900,7 +3900,7 @@ function getsvgsize($svgFilename)
return $imageSize; return $imageSize;
} }
function errorimage($text, $target_size) function errorimage($text, $target_size = null)
{ {
$width = 640; $width = 640;
$height = 480; $height = 480;

2
module_index.json
View File

@ -95,7 +95,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.", "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.",
"id": "feature-upload", "id": "feature-upload",
"lastupdate": 1482008539, "lastupdate": 1492428125,
"optional": false "optional": false
}, },
{ {

2
modules/feature-upload.php
View File

@ -540,7 +540,7 @@ function getsvgsize($svgFilename)
return $imageSize; return $imageSize;
} }
function errorimage($text, $target_size) function errorimage($text, $target_size = null)
{ {
$width = 640; $width = 640;
$height = 480; $height = 480;