jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikibase
......................................................................
Update Wikibase
With changes I forgot yesterday.
Contains:
52b4d30a01f385d78c5c7af1ee7b5b0d0fc441f0
657c5f61321a20055a8598f37816f35e14c30afe
Change-Id: I58a8c11ca40c462d4d46856323421ddc22ea7e60
---
M composer.lock
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/includes/actions/EditEntityAction.php
M vendor/composer/installed.json
4 files changed, 16 insertions(+), 10 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index ce5c4ed..50f7960 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1234,12 +1234,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "ba7c6f56d82478335eb45a1278f71c9eb926c93c"
+ "reference": "fe4ad3f482352baf317a537fd1f55628bf7e2054"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ba7c6f56d82478335eb45a1278f71c9eb926c93c";,
- "reference": "ba7c6f56d82478335eb45a1278f71c9eb926c93c",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fe4ad3f482352baf317a537fd1f55628bf7e2054";,
+ "reference": "fe4ad3f482352baf317a537fd1f55628bf7e2054",
"shasum": ""
},
"require": {
@@ -1306,7 +1306,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-02-24 19:02:49"
+ "time": "2015-02-25 14:13:29"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/Wikibase.php
b/extensions/Wikibase/repo/Wikibase.php
index 7010a28..8abad91 100644
--- a/extensions/Wikibase/repo/Wikibase.php
+++ b/extensions/Wikibase/repo/Wikibase.php
@@ -64,7 +64,7 @@
call_user_func( function() {
global $wgExtensionCredits, $wgGroupPermissions,
$wgExtensionMessagesFiles, $wgMessagesDirs;
- global $wgAPIModules, $wgSpecialPages, $wgHooks;
+ global $wgAPIModules, $wgSpecialPages, $wgHooks, $wgAvailableRights;
global $wgWBRepoSettings, $wgResourceModules, $wgValueParsers,
$wgJobClasses;
$wgExtensionCredits['wikibase'][] = array(
@@ -90,6 +90,12 @@
$wgGroupPermissions['*']['item-redirect'] = true;
$wgGroupPermissions['*']['property-create'] = true;
+ $wgAvailableRights[] = 'item-term';
+ $wgAvailableRights[] = 'property-term';
+ $wgAvailableRights[] = 'item-merge';
+ $wgAvailableRights[] = 'item-redirect';
+ $wgAvailableRights[] = 'property-create';
+
// i18n
$wgMessagesDirs['Wikibase'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['WikibaseAlias'] =
__DIR__ . '/Wikibase.i18n.alias.php';
diff --git a/extensions/Wikibase/repo/includes/actions/EditEntityAction.php
b/extensions/Wikibase/repo/includes/actions/EditEntityAction.php
index 901109d..8aee47d 100644
--- a/extensions/Wikibase/repo/includes/actions/EditEntityAction.php
+++ b/extensions/Wikibase/repo/includes/actions/EditEntityAction.php
@@ -232,7 +232,7 @@
protected function showStatusErrorsPage( $title, Status $status ) {
$this->getOutput()->prepareErrorPage( $this->msg( $title ),
$this->msg( 'errorpagetitle' ) );
- $this->getOutput()->addWikiText( $status->getMessage() );
+ $this->getOutput()->addWikiText( $status->getMessage()->text()
);
$this->getOutput()->returnToMain();
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 9a7a83a..52d2db8 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "ba7c6f56d82478335eb45a1278f71c9eb926c93c"
+ "reference": "fe4ad3f482352baf317a537fd1f55628bf7e2054"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ba7c6f56d82478335eb45a1278f71c9eb926c93c";,
- "reference": "ba7c6f56d82478335eb45a1278f71c9eb926c93c",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fe4ad3f482352baf317a537fd1f55628bf7e2054";,
+ "reference": "fe4ad3f482352baf317a537fd1f55628bf7e2054",
"shasum": ""
},
"require": {
@@ -1359,7 +1359,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2015-02-24 19:02:49",
+ "time": "2015-02-25 14:13:29",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/192800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58a8c11ca40c462d4d46856323421ddc22ea7e60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf19
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
