| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_QueryPrinter.php |
| — | — | @@ -182,6 +182,15 @@ |
| 183 | 183 | return $result; |
| 184 | 184 | } |
| 185 | 185 | |
| | 186 | + /** |
| | 187 | + * Continuation of getResult that only gets executed for non file outputs. |
| | 188 | + * |
| | 189 | + * @since 1.6 |
| | 190 | + * |
| | 191 | + * @param string $result |
| | 192 | + * |
| | 193 | + * @return string |
| | 194 | + */ |
| 186 | 195 | protected function handleNonFileResult( $result ) { |
| 187 | 196 | $result .= $this->getErrorString( $results ); // append errors |
| 188 | 197 | |
| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_SetupLight.php |
| — | — | @@ -14,7 +14,7 @@ |
| 15 | 15 | * @ingroup SMW |
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | | -define( 'SMW_VERSION', '1.5.7-light alpha' ); |
| | 18 | +define( 'SMW_VERSION', '1.6-light alpha' ); |
| 19 | 19 | |
| 20 | 20 | require_once( 'SMW_GlobalFunctions.php' ); |
| 21 | 21 | |
| — | — | @@ -267,16 +267,6 @@ |
| 268 | 268 | |
| 269 | 269 | $smwgMW_1_14 = true; // assume latest 1.14 API |
| 270 | 270 | |
| 271 | | - ///// credits (see "Special:Version") ///// |
| 272 | | - $wgExtensionCredits['parserhook'][] = array( |
| 273 | | - 'path' => __FILE__, |
| 274 | | - 'name' => 'Semantic MediaWiki light', |
| 275 | | - 'version' => SMW_VERSION, |
| 276 | | - 'author' => "[http://korrekt.org Markus Krötzsch], [http://simia.net Denny Vrandecic] and [http://www.ohloh.net/p/smw/contributors others]. Maintained by [http://www.aifb.kit.edu/web/Wissensmanagement/en AIFB Karlsruhe].", |
| 277 | | - 'url' => 'http://semantic-mediawiki.org', |
| 278 | | - 'descriptionmsg' => 'smw-desc' |
| 279 | | - ); |
| 280 | | - |
| 281 | 271 | wfProfileOut( 'smwfSetupExtension (SMW)' ); |
| 282 | 272 | return true; |
| 283 | 273 | } |
| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | // The SMW version number. |
| 12 | | -define( 'SMW_VERSION', '1.5.7 alpha' ); |
| | 12 | +define( 'SMW_VERSION', '1.6 alpha' ); |
| 13 | 13 | |
| 14 | 14 | // A flag used to indicate SMW defines a semantic extension type for extension crdits. |
| 15 | 15 | define( 'SEMANTIC_EXTENSION_TYPE', true ); |
| — | — | @@ -310,16 +310,6 @@ |
| 311 | 311 | } |
| 312 | 312 | $smwgMW_1_14 = true; // assume latest 1.14 API |
| 313 | 313 | |
| 314 | | - // Registration of the extension credits, see Special:Version. |
| 315 | | - $wgExtensionCredits['semantic'][] = array( |
| 316 | | - 'path' => __FILE__, |
| 317 | | - 'name' => 'Semantic MediaWiki', |
| 318 | | - 'version' => SMW_VERSION, |
| 319 | | - 'author' => "[http://korrekt.org Markus Krötzsch], [http://simia.net Denny Vrandecic] and [http://www.ohloh.net/p/smw/contributors others]. Maintained by [http://www.aifb.kit.edu/web/Wissensmanagement/en AIFB Karlsruhe].", |
| 320 | | - 'url' => 'http://semantic-mediawiki.org', |
| 321 | | - 'descriptionmsg' => 'smw-desc' |
| 322 | | - ); |
| 323 | | - |
| 324 | 314 | wfProfileOut( 'smwfSetupExtension (SMW)' ); |
| 325 | 315 | return true; |
| 326 | 316 | } |
| Index: trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.php |
| — | — | @@ -26,3 +26,13 @@ |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | require_once dirname( __FILE__ ) . '/SMW_Settings.php'; |
| | 30 | + |
| | 31 | +// Registration of the extension credits, see Special:Version. |
| | 32 | +$wgExtensionCredits['semantic'][] = array( |
| | 33 | + 'path' => __FILE__, |
| | 34 | + 'name' => 'Semantic MediaWiki', |
| | 35 | + 'version' => SMW_VERSION, |
| | 36 | + 'author' => '[http://korrekt.org Markus Krötzsch], [http://simia.net Denny Vrandecic] and [http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]. Maintained by [http://www.aifb.kit.edu/web/Wissensmanagement/en AIFB Karlsruhe].', |
| | 37 | + 'url' => 'http://semantic-mediawiki.org', |
| | 38 | + 'descriptionmsg' => 'smw-desc' |
| | 39 | +); |