Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/301609
Change subject: Update Wikidata - Fix uncaught exception when undeleting and
fix css
......................................................................
Update Wikidata - Fix uncaught exception when undeleting and fix css
Change-Id: I763952cf7c8589a0b0d9a4c86c95f5d30b3e5b4f
---
M composer.lock
M extensions/Wikibase/composer.json
M extensions/Wikibase/repo/Wikibase.hooks.php
M
extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
M vendor/composer/installed.json
5 files changed, 13 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/09/301609/1
diff --git a/composer.lock b/composer.lock
index 2a65c18..a1eb505 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1456,12 +1456,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "d48e3f5eae57a12cb59383b98bbfb7f3c0d76c0a"
+ "reference": "3379e90baa0eb5cafc1af2687f6d0ce0ed20226d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d48e3f5eae57a12cb59383b98bbfb7f3c0d76c0a";,
- "reference": "d48e3f5eae57a12cb59383b98bbfb7f3c0d76c0a",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3379e90baa0eb5cafc1af2687f6d0ce0ed20226d";,
+ "reference": "3379e90baa0eb5cafc1af2687f6d0ce0ed20226d",
"shasum": ""
},
"require": {
@@ -1478,7 +1478,7 @@
"data-values/value-view": "~0.17.1",
"diff/diff": "~2.0",
"php": ">=5.5.0",
- "wikibase/data-model": "~6.0",
+ "wikibase/data-model": "~6.0.1",
"wikibase/data-model-javascript": "~2.0.0",
"wikibase/data-model-serialization": "~2.2",
"wikibase/data-model-services": "~3.5",
@@ -1533,7 +1533,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-07-11 18:27:23"
+ "time": "2016-07-25 23:41:05"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/composer.json
b/extensions/Wikibase/composer.json
index f6d63e1..101e62d 100644
--- a/extensions/Wikibase/composer.json
+++ b/extensions/Wikibase/composer.json
@@ -33,7 +33,7 @@
"data-values/serialization": "~1.1",
"data-values/javascript": "~0.8.0",
"data-values/value-view": "~0.17.1",
- "wikibase/data-model": "~6.0",
+ "wikibase/data-model": "~6.0.1",
"wikibase/data-model-serialization": "~2.2",
"wikibase/internal-serialization": "~2.3",
"wikibase/data-model-services": "~3.5",
diff --git a/extensions/Wikibase/repo/Wikibase.hooks.php
b/extensions/Wikibase/repo/Wikibase.hooks.php
index 576be14..a9a9690 100644
--- a/extensions/Wikibase/repo/Wikibase.hooks.php
+++ b/extensions/Wikibase/repo/Wikibase.hooks.php
@@ -458,7 +458,7 @@
:
$skinTemplate->getRevisionId();
$rev = Revision::newFromId( $revid );
- if ( $rev->isDeleted(
Revision::DELETED_TEXT ) ) {
+ if ( !$rev || $rev->isDeleted(
Revision::DELETED_TEXT ) ) {
return;
}
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
b/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
index d158a4e..bcdf053 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
@@ -8,6 +8,7 @@
padding: 0;
position: absolute;
z-index: 4; /* needed for MonoBook, #p-search is at 3 */
+ font-size: 0.8em;
}
.ui-entityselector-list li,
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3cc4d6c..73f02fa 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1609,12 +1609,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "d48e3f5eae57a12cb59383b98bbfb7f3c0d76c0a"
+ "reference": "3379e90baa0eb5cafc1af2687f6d0ce0ed20226d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d48e3f5eae57a12cb59383b98bbfb7f3c0d76c0a";,
- "reference": "d48e3f5eae57a12cb59383b98bbfb7f3c0d76c0a",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3379e90baa0eb5cafc1af2687f6d0ce0ed20226d";,
+ "reference": "3379e90baa0eb5cafc1af2687f6d0ce0ed20226d",
"shasum": ""
},
"require": {
@@ -1631,7 +1631,7 @@
"data-values/value-view": "~0.17.1",
"diff/diff": "~2.0",
"php": ">=5.5.0",
- "wikibase/data-model": "~6.0",
+ "wikibase/data-model": "~6.0.1",
"wikibase/data-model-javascript": "~2.0.0",
"wikibase/data-model-serialization": "~2.2",
"wikibase/data-model-services": "~3.5",
@@ -1647,7 +1647,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-07-11 18:27:23",
+ "time": "2016-07-25 23:41:05",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/301609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I763952cf7c8589a0b0d9a4c86c95f5d30b3e5b4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
