Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/124348
Change subject: New build, fixes for phpunit tests, typography and page
protection bug
......................................................................
New build, fixes for phpunit tests, typography and page protection bug
Change-Id: Ifdf3511690e11a81d5abaf9a06a6fa2419c7e37d
---
M composer.lock
M extensions/Wikibase/client/includes/UpdateRepo.php
M extensions/Wikibase/lib/i18n/en.json
M extensions/Wikibase/lib/i18n/qqq.json
M extensions/Wikibase/lib/resources/wikibase.css
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/resources/themes/default/wikibase.toc.css
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
12 files changed, 35 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/48/124348/1
diff --git a/composer.lock b/composer.lock
index c220268..8a4fd5b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -46,7 +46,7 @@
{
"name": "Kyle Robinson Young",
"email": "[email protected]",
- "homepage": "http://dontkry.com";,
+ "homepage": "https://github.com/shama";,
"role": "Developer"
}
],
@@ -856,12 +856,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "5ae31248b63c708dd14d32c1d0ffa43a217a6a75"
+ "reference": "2e90a18781a6d062c7f2606ea6dd2304ba864ad9"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5ae31248b63c708dd14d32c1d0ffa43a217a6a75";,
- "reference": "5ae31248b63c708dd14d32c1d0ffa43a217a6a75",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2e90a18781a6d062c7f2606ea6dd2304ba864ad9";,
+ "reference": "2e90a18781a6d062c7f2606ea6dd2304ba864ad9",
"shasum": ""
},
"require": {
@@ -920,7 +920,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-04-03 10:21:28"
+ "time": "2014-04-07 13:49:31"
}
],
"packages-dev": [
diff --git a/extensions/Wikibase/client/includes/UpdateRepo.php
b/extensions/Wikibase/client/includes/UpdateRepo.php
index 6e560d4..d889ddc 100644
--- a/extensions/Wikibase/client/includes/UpdateRepo.php
+++ b/extensions/Wikibase/client/includes/UpdateRepo.php
@@ -8,7 +8,7 @@
use RuntimeException;
use Title;
use User;
-use Wikibase\DataModel\SiteLink;
+use Wikibase\DataModel\SimpleSiteLink;
use JobSpecification;
/**
@@ -81,7 +81,7 @@
public function getEntityId() {
if ( $this->entityId === false ) {
$this->entityId =
$this->siteLinkLookup->getEntityIdForSiteLink(
- new SiteLink(
+ new SimpleSiteLink(
$this->siteId,
$this->title->getFullText()
)
diff --git a/extensions/Wikibase/lib/i18n/en.json
b/extensions/Wikibase/lib/i18n/en.json
index 64a102f..7e37d99 100644
--- a/extensions/Wikibase/lib/i18n/en.json
+++ b/extensions/Wikibase/lib/i18n/en.json
@@ -53,6 +53,8 @@
"wikibase-globedetails-latitude": "Latitude",
"wikibase-globedetails-precision": "Precision",
"wikibase-globedetails-globe": "Globe",
+ "wikibase-parse-error": "Malformed value.",
+ "wikibase-unexpected-error": "Unexpected error: $1.",
"wikibase-replicationnote": "Please notice that it can take several
minutes until the changes are visible on all wikis.",
"wikibase-sitelinks-wikipedia": "Wikipedia pages linked to this item",
"wikibase-sitelinks-sitename-columnheading": "Language",
@@ -93,4 +95,4 @@
"wikibase-time-precision-BCE-millennium": "$1. millennium BCE",
"wikibase-time-precision-BCE-century": "$1. century BCE",
"wikibase-time-precision-BCE-10annum": "$1s BCE"
-}
\ No newline at end of file
+}
diff --git a/extensions/Wikibase/lib/i18n/qqq.json
b/extensions/Wikibase/lib/i18n/qqq.json
index bcf331c..e084ee3 100644
--- a/extensions/Wikibase/lib/i18n/qqq.json
+++ b/extensions/Wikibase/lib/i18n/qqq.json
@@ -61,6 +61,8 @@
"wikibase-globedetails-latitude": "Label used for the \"latitude\" field
of a globecoordinate value when showing a detailed representation of the time,
e.g. in a diff.\n{{Identical|Latitude}}",
"wikibase-globedetails-precision": "Label used for the \"precision\" field
of a globecoordinate value when showing a detailed representation of the time,
e.g. in a diff.",
"wikibase-globedetails-globe": "Label used for the \"globe\" field of a
globecoordinate value when showing a detailed representation of the time, e.g.
in a diff.",
+ "wikibase-parse-error": "Generic error used by the API (in particular, by
wbparsevalue) to indicate that some user input was malformed and could not be
parsed",
+ "wikibase-unexpected-error": "Generic error used by the API to indicate
that an unexpected error occurred.\n\nParameters:\n* $1 - the raw, unlocalized
error message",
"wikibase-replicationnote": "Note telling the user that it can take a few
minutes until the made changes are visible on all wikis.\nPreceded by message
{{msg-mw|Wikibase-linkitem-success-link}}",
"wikibase-sitelinks-wikipedia": "[[File:Screenshot WikidataRepo 2012-05-13
A.png|right|0x150px]]\nHeader messages for pages on different Wikipedias linked
to this item. Similar messages can be created for each group of target sites,
depending on configuration.\nSee also Wikidatas glossary for
[[d:Wikidata:Glossary#sitelinks|site links]] and
[[d:Wikidata:Glossary#Item|item]].\n{{Related|Wikibase-sitelinks}}",
"wikibase-sitelinks-sitename-columnheading": "Site links table column
heading for the column containing the language names.\n{{Identical|Language}}",
@@ -101,4 +103,4 @@
"wikibase-time-precision-BCE-millennium": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 1000
years\n{{Related|Wikibase-time-precision}}",
"wikibase-time-precision-BCE-century": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 100
years\n{{Related|Wikibase-time-precision}}",
"wikibase-time-precision-BCE-10annum": "!!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 10
years\n{{Related|Wikibase-time-precision}}"
-}
\ No newline at end of file
+}
diff --git a/extensions/Wikibase/lib/resources/wikibase.css
b/extensions/Wikibase/lib/resources/wikibase.css
index c148c50..ac6e61d 100644
--- a/extensions/Wikibase/lib/resources/wikibase.css
+++ b/extensions/Wikibase/lib/resources/wikibase.css
@@ -165,10 +165,14 @@
/********** LABEL **********/
+#content .wb-firstHeading {
+ font-size: 100%; /* required since Gerrit
Ic5ba836364d04b2c3814777b69b5f47fce25292a */
+}
+
.wb-firstHeading {
border-bottom: 0;
- margin-bottom: 0;
- padding-top: 0;
+ margin-bottom: 0; /* FIXME: Should be removed if the Typography refresh
is stable */
+ padding-top: 0; /* FIXME: Should be removed if the Typography refresh
is stable */
clear: both; /* so success bar after new item created won't float
heading */
}
@@ -212,6 +216,8 @@
/* the following lines are used to vertically position the toolbar on the
baseline of the heading
(label) which has a bigger font size */
.wb-firstHeading .wb-editsection {
+ /* FIXME: Should use the LESS variable @content-font-family */
+ font-family: Arimo, "Liberation Sans", "Helvetica Neue", Helvetica,
Arial, sans-serif;
line-height: 188%;
top: .3em; /* even out margin of label container in view mode */
}
@@ -228,11 +234,6 @@
.wb-firstHeading .wikibase-toolbar .wikibase-toolbarlabel /* tooltip */ {
font-size: 100%;
margin-bottom: 0; /* even out border of label container in view mode */
-}
-
-/* FIXME: Very specific selector to temporary overrule VectorBeta extension */
-#content .wb-firstHeading {
- font-size: 100%;
}
/********** /LABEL **********/
@@ -1047,4 +1048,4 @@
margin: 0;
border: none;
}
-/***** /DIFF VIEW *****/
\ No newline at end of file
+/***** /DIFF VIEW *****/
diff --git a/extensions/Wikibase/repo/i18n/en.json
b/extensions/Wikibase/repo/i18n/en.json
index 17ad99d..24aaee9 100644
--- a/extensions/Wikibase/repo/i18n/en.json
+++ b/extensions/Wikibase/repo/i18n/en.json
@@ -266,8 +266,6 @@
"wikibase-api-param-illegal": "An illegal set of parameters have been
used",
"wikibase-api-permissiondenied": "You do not have the permissions needed
to carry out this action",
"wikibase-api-wrong-class": "Wrong class type detected",
- "wikibase-parse-error": "Malformed value.",
- "wikibase-unexpected-error": "Unexpected error: $1.",
"wikibase-self-conflict-patched": "Your edit was patched into the latest
version, overriding some of your own intermediate changes.",
"wikibase-conflict-patched": "Your edit was patched into the latest
version.",
"wikibase-restoreold": "restore",
@@ -365,4 +363,4 @@
"right-item-merge": "Merge items",
"right-property-term": "Change property terms (labels, descriptions,
aliases)",
"right-property-create": "Create properties"
-}
\ No newline at end of file
+}
diff --git a/extensions/Wikibase/repo/i18n/qqq.json
b/extensions/Wikibase/repo/i18n/qqq.json
index 434f97d..6699921 100644
--- a/extensions/Wikibase/repo/i18n/qqq.json
+++ b/extensions/Wikibase/repo/i18n/qqq.json
@@ -286,8 +286,6 @@
"wikibase-api-param-illegal": "!!DO NOT TRANSLATE!! An illegal set of
parameters have been used, General message for when the parameters passed in a
request conflict or do not pass the initial tests",
"wikibase-api-permissiondenied": "!!DO NOT TRANSLATE!! the user making the
request does not have the correct permissions or rights to carry out the
request",
"wikibase-api-wrong-class": "!!DO NOT TRANSLATE!! The wrong class type has
been detected when trying to make the request, this could be and item isntead
of a property.",
- "wikibase-parse-error": "Generic error used by the API (in particular, by
wbparsevalue) to indicate that some user input was malformed and could not be
parsed",
- "wikibase-unexpected-error": "Generic error used by the API to indicate
that an unexpected error occurred.\n\nParameters:\n* $1 - the raw, unlocalized
error message",
"wikibase-self-conflict-patched": "Warning issued when an edit is made
based on an old revision, clean patching was not possible, but all intermediate
edits where made by the same user, so aggressive patching was applied,
overriding earlier changes by the same user. This may happen e.g. when editing
the same item in multiple browser windows. This warning is usually not
displayed.",
"wikibase-conflict-patched": "Warning issued when an edit is made based on
an old revision, but the edit conflict could be resolved by patching. This
warning is usually not displayed.",
"wikibase-restoreold": "Link text shown on the link that lets the user
restore the page's content to an old revision. Must be distinct from undo and
revert. Used on the diff views.\n{{Identical|Restore}}",
diff --git a/extensions/Wikibase/repo/resources/themes/default/wikibase.toc.css
b/extensions/Wikibase/repo/resources/themes/default/wikibase.toc.css
index b3e1bf5..c6e0b6f 100644
--- a/extensions/Wikibase/repo/resources/themes/default/wikibase.toc.css
+++ b/extensions/Wikibase/repo/resources/themes/default/wikibase.toc.css
@@ -37,7 +37,7 @@
border-right: 0;
}
-/* FIXME: Very specific selector to temporary overrule VectorBeta extension */
+/* FIXME: Should be removed if the Typography refresh is stable */
#content .wb-entity #toc {
margin-top: 1.8em;
}
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
index e754f03..143633e 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
@@ -149,20 +149,6 @@
} );
} );
- // Restrict entity page actions if editing is restricted:
- var editRestriction = mw.config.get( 'wgRestrictionEdit' );
- if( editRestriction !== null && editRestriction.length === 1 ) {
- var hasGroup = $.inArray( editRestriction[0],
mw.config.get( 'wgUserGroups' ) );
- if( !hasGroup ) {
- mw.user.getRights( function( rights ) {
- var hasRight = $.inArray(
editRestriction, rights ) !== -1;
- if( !hasRight ) {
- $( wb ).triggerHandler(
'restrictEntityPageActions' );
- }
- } );
- }
- }
-
if ( !mw.config.get( 'wbUserCanEdit' ) ) {
$( wb ).triggerHandler( 'restrictEntityPageActions' );
} else if ( mw.config.get( 'wbUserIsBlocked' ) ) {
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 753ea7a..990961f 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitb2f430e3c2039577b93e1d27f94dd640::getLoader();
+return ComposerAutoloaderInit6991aa7e5f3808cb8037d5e0d9eda019::getLoader();
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index 5f79915..5c25ba3 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitb2f430e3c2039577b93e1d27f94dd640
+class ComposerAutoloaderInit6991aa7e5f3808cb8037d5e0d9eda019
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInitb2f430e3c2039577b93e1d27f94dd640',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit6991aa7e5f3808cb8037d5e0d9eda019',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitb2f430e3c2039577b93e1d27f94dd640',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit6991aa7e5f3808cb8037d5e0d9eda019',
'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequireb2f430e3c2039577b93e1d27f94dd640($file);
+ composerRequire6991aa7e5f3808cb8037d5e0d9eda019($file);
}
return $loader;
}
}
-function composerRequireb2f430e3c2039577b93e1d27f94dd640($file)
+function composerRequire6991aa7e5f3808cb8037d5e0d9eda019($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index af4b9e5..4ec98b3 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -43,7 +43,7 @@
{
"name": "Kyle Robinson Young",
"email": "[email protected]",
- "homepage": "http://dontkry.com";,
+ "homepage": "https://github.com/shama";,
"role": "Developer"
}
],
@@ -883,12 +883,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "5ae31248b63c708dd14d32c1d0ffa43a217a6a75"
+ "reference": "2e90a18781a6d062c7f2606ea6dd2304ba864ad9"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5ae31248b63c708dd14d32c1d0ffa43a217a6a75";,
- "reference": "5ae31248b63c708dd14d32c1d0ffa43a217a6a75",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2e90a18781a6d062c7f2606ea6dd2304ba864ad9";,
+ "reference": "2e90a18781a6d062c7f2606ea6dd2304ba864ad9",
"shasum": ""
},
"require": {
@@ -907,7 +907,7 @@
"wikibase/data-model": "~0.7.2",
"wikibase/easyrdf_lite": "~0.8.1"
},
- "time": "2014-04-03 10:21:28",
+ "time": "2014-04-07 13:49:31",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/124348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdf3511690e11a81d5abaf9a06a6fa2419c7e37d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.23-wmf21
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
