Skip to content

Commit 85134eb

Browse files
committed
Merge pull request #595 from wmde/mwcredits
Use extension registration for MediaWiki extension credits
2 parents 5ef7c57 + bdc20a2 commit 85134eb

5 files changed

Lines changed: 19 additions & 38 deletions

File tree

RELEASE-NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Wikibase DataModel release notes
22

3+
## Version 5.0.0 (alpha)
4+
5+
* Removed `WIKIBASE_DATAMODEL_VERSION` constant.
6+
37
## Version 4.4.0 (2016-01-20)
48

59
* Added `ItemIdParser`

WikibaseDataModel.mw.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

WikibaseDataModel.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,8 @@
77
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
88
*/
99

10-
if ( defined( 'WIKIBASE_DATAMODEL_VERSION' ) ) {
11-
// Do not initialize more than once.
12-
return 1;
13-
}
14-
15-
define( 'WIKIBASE_DATAMODEL_VERSION', '4.4.0' );
16-
17-
if ( defined( 'MEDIAWIKI' ) ) {
18-
call_user_func( function() {
19-
require_once __DIR__ . '/WikibaseDataModel.mw.php';
20-
} );
10+
if ( defined( 'MEDIAWIKI' ) && function_exists( 'wfLoadExtension' ) ) {
11+
wfLoadExtension( 'WikibaseDataModel', __DIR__ . '/mediawiki-extension.json' );
2112
}
2213

2314
// Aliases introduced in 3.0.0

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
"extra": {
4343
"branch-alias": {
44-
"dev-master": "4.4.x-dev"
44+
"dev-master": "5.0.x-dev"
4545
}
4646
},
4747
"scripts": {

mediawiki-extension.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "Wikibase DataModel",
3+
"version": "5.0.0 alpha",
4+
"author": [
5+
"[https://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]",
6+
"Thiemo Mättig"
7+
],
8+
"url": "https://github.com/wmde/WikibaseDataModel",
9+
"description": "The canonical PHP implementation of the Data Model at the heart of the Wikibase software.",
10+
"license-name": "GPL-2.0+",
11+
"type": "wikibase"
12+
}

0 commit comments

Comments
 (0)