| Index: trunk/extensions/SemanticMaps/includes/queryprinters/SM_MapPrinter.php |
| — | — | @@ -190,14 +190,18 @@ |
| 191 | 191 | |
| 192 | 192 | $validator->validateParameters(); |
| 193 | 193 | |
| 194 | | - $showMap = $validator->hasFatalError(); |
| | 194 | + $fatalError = $validator->hasFatalError(); |
| 195 | 195 | |
| 196 | | - if ( $showMap ) { |
| 197 | | - $validator->formatParameters(); |
| | 196 | + if ( $fatalError === false ) { |
| 198 | 197 | $this->setMapProperties( $validator->getParameterValues() ); |
| 199 | 198 | } |
| | 199 | + else { |
| | 200 | + $this->output = '<span class="errorbox">' . |
| | 201 | + htmlspecialchars( wfMsgExt( 'validator-fatal-error', 'parsemag', $error->getMessage() ) ) . |
| | 202 | + '</span>'; |
| | 203 | + } |
| 200 | 204 | |
| 201 | | - return $showMap; |
| | 205 | + return !$fatalError; |
| 202 | 206 | } |
| 203 | 207 | |
| 204 | 208 | /** |
| Index: trunk/extensions/SemanticMaps/includes/queryprinters/SM_Mapper.php |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | */ |
| 25 | 25 | public function __construct( $format, $inline ) { |
| 26 | 26 | global $egMapsDefaultServices; |
| 27 | | - |
| | 27 | + |
| 28 | 28 | // TODO: allow service parameter to override the default |
| 29 | 29 | // Note: if this is allowed, then the getParameters should only return the base parameters. |
| 30 | 30 | if ( $format == 'map' ) $format = $egMapsDefaultServices['qp']; |