Skip to content

Commit 7901207

Browse files
committed
Fix error handling.
1 parent 9b006a2 commit 7901207

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

SpriteSheet.hooks.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class SpriteSheetHooks {
100100
*
101101
* @var array
102102
*/
103-
static private $errors = false;
103+
static private $errors = [];
104104

105105
/**
106106
* The tag type being processed, either sprite or slice.
@@ -149,7 +149,7 @@ static public function onParserFirstCallInit(Parser &$parser) {
149149
* @return string Wiki Text
150150
*/
151151
static public function generateSpriteOutput(Parser &$parser, PPFrame $frame, $arguments) {
152-
self::$errors = false;
152+
self::$errors = [];
153153
self::$tagType = "sprite";
154154

155155
$parameters = self::cleanAndSetupParameters($arguments, $frame);
@@ -166,7 +166,8 @@ static public function generateSpriteOutput(Parser &$parser, PPFrame $frame, $ar
166166

167167
if (!$spriteSheet->getId() || !$spriteSheet->getColumns() || !$spriteSheet->getRows()) {
168168
//Either a sprite sheet does not exist or has invalid values.
169-
return self::makeErrorBox('no_sprite_sheet_defined', [$title->getPrefixedText()]);
169+
self::setError('no_sprite_sheet_defined', [$title->getPrefixedText()]);
170+
return self::makeErrorBox();
170171
}
171172

172173
if (!empty($parameters['name'])) {

0 commit comments

Comments
 (0)