WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/124295
Change subject: New Wikidata Build - 07/04/2014 09:14
......................................................................
New Wikidata Build - 07/04/2014 09:14
Change-Id: I81f1dd82c5eab897ce2bbdef3564a735393741fb
---
M composer.lock
M extensions/Wikibase/client/i18n/co.json
M extensions/Wikibase/client/i18n/eo.json
M extensions/Wikibase/client/i18n/sv.json
M extensions/Wikibase/lib/i18n/eo.json
M extensions/Wikibase/lib/i18n/sv.json
M extensions/Wikibase/repo/Wikibase.i18n.alias.php
M extensions/Wikibase/repo/i18n/eo.json
M extensions/Wikibase/repo/i18n/sv.json
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpsMerge.php
M extensions/Wikibase/repo/includes/view/SnakHtmlGenerator.php
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
14 files changed, 107 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/95/124295/1
diff --git a/composer.lock b/composer.lock
index 18675fe..fcade10 100644
--- a/composer.lock
+++ b/composer.lock
@@ -856,12 +856,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "28ba46099f9ddb5af036d5076e1818524ed4c525"
+ "reference": "8b521a7bdd79b6e6fe6ff88c16c4efbc03de62e1"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/28ba46099f9ddb5af036d5076e1818524ed4c525";,
- "reference": "28ba46099f9ddb5af036d5076e1818524ed4c525",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8b521a7bdd79b6e6fe6ff88c16c4efbc03de62e1";,
+ "reference": "8b521a7bdd79b6e6fe6ff88c16c4efbc03de62e1",
"shasum": ""
},
"require": {
@@ -920,7 +920,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-04-05 19:47:23"
+ "time": "2014-04-06 22:45:40"
}
],
"packages-dev": [
diff --git a/extensions/Wikibase/client/i18n/co.json
b/extensions/Wikibase/client/i18n/co.json
index f99cf7e..e3ba2aa 100644
--- a/extensions/Wikibase/client/i18n/co.json
+++ b/extensions/Wikibase/client/i18n/co.json
@@ -4,5 +4,6 @@
"Paulu"
]
},
+ "wikibase-dataitem": "Elementu dati",
"wikibase-rc-wikibase-edit-title": "Quessa hè una mudifica nantu à
Wikidata"
-}
\ No newline at end of file
+}
diff --git a/extensions/Wikibase/client/i18n/eo.json
b/extensions/Wikibase/client/i18n/eo.json
index 337950d..ecc8d1c 100644
--- a/extensions/Wikibase/client/i18n/eo.json
+++ b/extensions/Wikibase/client/i18n/eo.json
@@ -40,6 +40,8 @@
"wikibase-property-notfound": "Atributo $1 ne estas trovita.",
"wikibase-property-notsupportedyet": "Wikibase ankoraŭ ne subtenas
atributan specon por atribuo $1.",
"wikibase-rc-hide-wikidata": "$1 Vikidatumoj",
+ "wikibase-rc-hide-wikidata-hide": "Kaŝi",
+ "wikibase-rc-hide-wikidata-show": "Montri",
"wikibase-rc-show-wikidata-pref": "Montru Vikidatumajn redaktojn en la
lastaj ŝanĝoj",
"wikibase-rc-wikibase-edit-letter": "D",
"wikibase-rc-wikibase-edit-title": "Redakto en Vikidatumoj",
@@ -53,5 +55,6 @@
"wikibase-unconnectedpages-iwdata-label": "Nur paĝon kun interlingva
ligiloj",
"wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|interlingva
ligilo|interlingvaj ligiloj}} en la paĝo)",
"wikibase-pageinfo-entity-id": "Identigilo de Vikidatuma ero",
- "wikibase-pageinfo-entity-id-none": "Nenio"
-}
\ No newline at end of file
+ "wikibase-pageinfo-entity-id-none": "Nenio",
+ "wikibase-otherprojects": "Aliaj projektoj"
+}
diff --git a/extensions/Wikibase/client/i18n/sv.json
b/extensions/Wikibase/client/i18n/sv.json
index 5ff0800..408184f 100644
--- a/extensions/Wikibase/client/i18n/sv.json
+++ b/extensions/Wikibase/client/i18n/sv.json
@@ -62,5 +62,6 @@
"wikibase-unconnectedpages-format-row": "($1
{{PLURAL:$1|interwikilänk|interwikilänkar}} på sidan)",
"wikibase-pageinfo-entity-id": "{{WBREPONAME}} objekt-ID",
"wikibase-pageinfo-entity-id-none": "Ingen",
- "wikibase-property-render-error": "Misslyckades att rendera egenskapen $1:
$2"
-}
\ No newline at end of file
+ "wikibase-property-render-error": "Misslyckades att rendera egenskapen $1:
$2",
+ "wikibase-otherprojects": "Andra projekt"
+}
diff --git a/extensions/Wikibase/lib/i18n/eo.json
b/extensions/Wikibase/lib/i18n/eo.json
index 91c61fe..3729583 100644
--- a/extensions/Wikibase/lib/i18n/eo.json
+++ b/extensions/Wikibase/lib/i18n/eo.json
@@ -11,6 +11,10 @@
"wikibase-entity-query": "Serĉomendo",
"wikibase-deletedentity-item": "Forigita ero",
"wikibase-diffview-reference": "referenco",
+ "wikibase-diffview-rank": "rango",
+ "wikibase-diffview-rank-preferred": "Preferata rango",
+ "wikibase-diffview-rank-normal": "Normala rango",
+ "wikibase-diffview-rank-deprecated": "Malpreferata rango",
"wikibase-diffview-label": "etikedo",
"wikibase-diffview-alias": "kromnomoj",
"wikibase-diffview-description": "priskribo",
@@ -31,14 +35,30 @@
"wikibase-error-ui-link-exists": "Vi ne povas ligi al ĉi tiu paĝo ĉar alia
ero ajm ligas al ĝi.",
"wikibase-error-ui-session-failure": "Via sesio ĉesis. bonvolu denove
ensaluti.",
"wikibase-error-ui-edit-conflict": "Estas redaktokonflikto. Bonvolu
reŝargi kaj konservi denove.",
+ "wikibase-quantitydetails-upperbound": "Supra limo",
+ "wikibase-quantitydetails-lowerbound": "Suba limo",
+ "wikibase-quantitydetails-unit": "Unuo",
+ "wikibase-timedetails-time": "Tempo",
+ "wikibase-timedetails-isotime": "Tempomarko laŭ ISO",
+ "wikibase-timedetails-calendar": "Kalendaro",
+ "wikibase-timedetails-precision": "Precizeco",
+ "wikibase-timedetails-before": "Antaŭ",
+ "wikibase-timedetails-after": "Post",
+ "wikibase-globedetails-longitude": "Longitudo",
+ "wikibase-globedetails-latitude": "Latitudo",
+ "wikibase-globedetails-precision": "Precizeco",
+ "wikibase-unexpected-error": "Nesupozita eraro: $1.",
"wikibase-replicationnote": "Bonvolu noti, ke povas daŭri kelkajn minutojn
ĝis la ŝanĝoj estos videblaj en ĉiuj vikioj.",
+ "wikibase-sitelinks-wikipedia": "Paĝoj de Vikipedio kunligitaj kun tiu ĉi
ero",
"wikibase-sitelinks-sitename-columnheading": "Lingvo",
"wikibase-sitelinks-siteid-columnheading": "Kodo",
"wikibase-sitelinks-link-columnheading": "Ligata paĝo",
"wikibase-tooltip-error-details": "Detaloj",
+ "wikibase-validator-bad-type": "$2 anstataŭ $1",
"wikibase-validator-no-such-entity": "$1 ne trovita",
"wikibase-validator-bad-value": "Malvalida valoro: $1",
+ "wikibase-validator-unknown-unit": "Nekonata unuo: $1",
"datatypes-type-wikibase-item": "Ero",
"datatypes-type-commonsMedia": "Multrimeda dosiero en Komunejo",
"version-wikibase": "Vikibazo"
-}
\ No newline at end of file
+}
diff --git a/extensions/Wikibase/lib/i18n/sv.json
b/extensions/Wikibase/lib/i18n/sv.json
index cdefa2d..3d1d267 100644
--- a/extensions/Wikibase/lib/i18n/sv.json
+++ b/extensions/Wikibase/lib/i18n/sv.json
@@ -55,6 +55,8 @@
"wikibase-globedetails-latitude": "Latitud",
"wikibase-globedetails-precision": "Precision",
"wikibase-globedetails-globe": "Glob",
+ "wikibase-parse-error": "Felformaterat värde.",
+ "wikibase-unexpected-error": "Oväntat fel: $1.",
"wikibase-replicationnote": "Observera att det kan ta flera minuter tills
förändringarna är synliga på alla wikier.",
"wikibase-sitelinks-wikipedia": "Wikipedia-sidor som är länkade till det
här objektet",
"wikibase-sitelinks-sitename-columnheading": "Språk",
@@ -83,4 +85,4 @@
"datatypes-type-wikibase-item": "Objekt",
"datatypes-type-commonsMedia": "Commons mediafil",
"version-wikibase": "Wikibase"
-}
\ No newline at end of file
+}
diff --git a/extensions/Wikibase/repo/Wikibase.i18n.alias.php
b/extensions/Wikibase/repo/Wikibase.i18n.alias.php
index 0be2c4b..b92ff5a 100644
--- a/extensions/Wikibase/repo/Wikibase.i18n.alias.php
+++ b/extensions/Wikibase/repo/Wikibase.i18n.alias.php
@@ -148,6 +148,10 @@
'ItemDisambiguation' => array( 'DesambiguaciónDeElementos' ),
'ListDatatypes' => array( 'ListarTiposDeDatos' ),
'SetLabel' => array( 'AsignarEtiqueta' ),
+ 'SetDescription' => array( 'DefinirDescripción' ),
+ 'SetAliases' => array( 'DefinirAliases' ),
+ 'SetSiteLink' => array( 'DefinirEnlaceSitio' ),
+ 'MergeItems' => array( 'CombinarElementos' ),
'EntitiesWithoutLabel' => array( 'EntidadesSinEtiqueta' ),
);
diff --git a/extensions/Wikibase/repo/i18n/eo.json
b/extensions/Wikibase/repo/i18n/eo.json
index 9cb2ec7..fdf1097 100644
--- a/extensions/Wikibase/repo/i18n/eo.json
+++ b/extensions/Wikibase/repo/i18n/eo.json
@@ -19,8 +19,10 @@
"wikibase-remove-inprogress": "Forigado...",
"wikibase-label-empty": "Neniu etikedo difinita",
"wikibase-label-edit-placeholder": "enigi etikedon",
+ "wikibase-label-edit-placeholder-language-aware": "enigu etikedon en $1",
"wikibase-description-empty": "Neniu priskribo jam difinita",
"wikibase-description-edit-placeholder": "enigi priskribon",
+ "wikibase-description-edit-placeholder-language-aware": "enigu priskribon
en $1",
"wikibase-sitelink-site-edit-placeholder": "retejo",
"wikibase-sitelink-page-edit-placeholder": "paĝo",
"wikibase-alias-edit-placeholder": "enigi kromnomon",
@@ -66,6 +68,7 @@
"wikibase-snakview-snaktypeselector-value": "propra valoro",
"wikibase-snakview-snaktypeselector-somevalue": "nekonata valoro",
"wikibase-snakview-snaktypeselector-novalue": "sen valoro",
+ "wikibase-snakformat-invalid-value": "Malvalida valoro.",
"wikibase-shortcopyrightwarning": "Klakante al \"$1\" vi akceptas la
[[$2|kondiĉojn de uzado]] kaj vi nerevokeble akceptas liberigi vian kontribuon
laŭ $3.",
"wikibase-copyrighttooltip-acknowledge": "Mi akceptas tiujn ĉi kondiĉojn
por miaj estontaj redaktoj. Ne plu montru tiun ĉi mesaĝon.",
"wikibase-entityselector-more": "pli",
@@ -130,6 +133,8 @@
"wikibase-setsitelink-remove-failed": "La reteja ligilo ne povis esti
konservita.",
"wikibase-modifyentity-id": "Identigilo:",
"wikibase-modifyterm-language": "Lingvo:",
+ "special-mergeitems": "Kunigi du erojn",
+ "wikibase-mergeitems-submit": "Kunigi erojn",
"wikibase-dispatchstats-change-id": "Identigo",
"wikibase-dispatchstats-change-timestamp": "Tempindiko",
"wikibase-dispatchstats-oldest-change": "Plej malnova",
@@ -144,11 +149,21 @@
"wikibase-listdatatypes-intro": "Ĉi tio estas la listo de ĉiuj datumtipoj
nune uzataj en ĉi tiu instalaĵo:",
"wikibase-history-title-with-label": "Revizia historio de \"$2\" ($1)",
"wikibase-history-title-without-label": "Revizia historio de ($1)",
+ "special-entitieswithoutdescription": "Entoj sen priskribo",
+ "wikibase-entitieswithoutdescription-legend": "Listigi entojn sen
priskribo",
+ "special-entitieswithoutlabel": "Entoj sen etikedo",
+ "wikibase-entitieswithoutlabel-legend": "Listigi entojn sen etikedo",
"wikibase-entitieswithoutlabel-label-language": "Lingvo:",
+ "wikibase-entitieswithoutlabel-label-type": "Tipo:",
"wikibase-entitieswithoutlabel-label-alltypes": "ĉiuj",
"wikibase-entitieswithoutlabel-submit": "Trovi",
"wikibase-entitieswithoutlabel-invalid-language": "\"$1\" ne estas valida
lingva kodo.",
+ "wikibase-entitieswithoutlabel-invalid-type": "\"$1\" ne estas valida
entotipo.",
"special-itemswithoutsitelinks": "Eroj sen retejligiloj",
+ "wikibase-entitydata-not-found": "Neniu ento kun identigilo $1 estis
trovita.",
+ "wikibase-entitydata-bad-id": "Malvalida identigilo: $1.",
+ "wikibase-entitydata-unsupported-format": "La datumformo $1 ne estas
subtena de tiu ĉi interfaco.",
+ "wikibase-entitydata-title": "Datumoj de ento",
"wikibase-restoreold": "restarigi",
"wikibase-restore-summary": "Restarigi version $1 de
[[Special:Contributions/$2|$2]]",
"wikibase-no-direct-editing": "Rekta redakto estas malebligita en nomspaco
$1",
@@ -159,8 +174,11 @@
"wikibase-item-summary-wbeditentity": "Kreu novan eron",
"wikibase-item-summary-wbeditentity-create": "Kreita nova ero",
"wikibase-item-summary-wbeditentity-update": "Ĝisdatigita ero",
+ "wikibase-item-summary-wbsetreference": "Enigita referenco",
+ "wikibase-item-summary-wbsetlabel-add": "Aldonita etikedo por [$2]",
"wikibase-item-summary-wbsetlabel-set": "Ŝanĝis etikedon [$2]",
"wikibase-item-summary-wbsetlabel-remove": "Forigis etikedon [$2]",
+ "wikibase-item-summary-wbsetdescription-add": "Aldonita priskribo por
[$2]",
"wikibase-item-summary-wbsetdescription-set": "Ŝanĝis priskribon [$2]",
"wikibase-item-summary-wbsetdescription-remove": "Forigis priskribon [$2]",
"wikibase-item-summary-wbsetaliases-set": "Kreis
{{PLURAL:$1|kromnomon|kromnomojn}} [$2]",
@@ -175,6 +193,7 @@
"wikibase-item-summary-wbcreateclaim-value": "Kreis
{{PLURAL:$1|deklaron|deklarojn}}",
"wikibase-item-summary-wbcreateclaim-novalue": "Kreis
{{PLURAL:$1|deklaron|deklarojn}}",
"wikibase-item-summary-wbcreateclaim-somevalue": "Kreis
{{PLURAL:$1|deklaron|deklarojn}}",
+ "wikibase-item-summary-clientsitelink-update": "Paĝo movita de [$3] al
[$4]",
"wikibase-item-summary-wbmergeitems-from": "Kunigita ero elde '$3'",
"wikibase-item-summary-wbmergeitems-to": "Kunigita ero al '$3'",
"wikibase-property-summary-wbcreate-new": "Kreita nova atributo",
@@ -193,5 +212,6 @@
"wikibase-listdatatypes-time-head": "Tempo",
"wikibase-listdatatypes-url-head": "URL",
"datatypes-type-url": "URL",
- "content-model-wikibase-item": "Vikidatuma ero"
-}
\ No newline at end of file
+ "content-model-wikibase-item": "Vikidatuma ero",
+ "right-item-merge": "Kunigado de eroj"
+}
diff --git a/extensions/Wikibase/repo/i18n/sv.json
b/extensions/Wikibase/repo/i18n/sv.json
index 07506e5..b28d081 100644
--- a/extensions/Wikibase/repo/i18n/sv.json
+++ b/extensions/Wikibase/repo/i18n/sv.json
@@ -31,7 +31,9 @@
"wikibase-alias-edit-placeholder": "ange ett alias",
"wikibase-label-input-help-message": "Ange titeln på denna datamängd på
$1.",
"wikibase-description-input-help-message": "Ange en kort beskrivning på
$1.",
+ "wikibase-claims": "Påståenden",
"wikibase-statements": "Uttalanden",
+ "wikibase-constraints": "Begränsningar",
"wikibase-terms": "På andra språk",
"wikibase-sitelinks-add": "lägg till en länk till en webbplatssida",
"wikibase-sitelinks-empty": "Inga webbplatssidor länkade till det här
objektet ännu.",
@@ -77,6 +79,8 @@
"wikibase-snakview-snaktypeselector-value": "anpassat värde",
"wikibase-snakview-snaktypeselector-somevalue": "okänt värde",
"wikibase-snakview-snaktypeselector-novalue": "inget värde",
+ "wikibase-snakformat-invalid-value": "Ogiltigt värde.",
+ "wikibase-snakformat-propertynotfound": "Egenskapen hittades inte.",
"wikibase-shortcopyrightwarning": "Genom att klicka på \"$1\" samtycker du
med [[$2|användarvillkoren]] och samtycker oåterkalleligen att släppa ditt
bidrag under $3.",
"wikibase-copyrighttooltip-acknowledge": "Jag accepterar dessa villkor för
mina framtida redigeringar. Visa inte detta meddelande igen.",
"wikibase-entityselector-more": "mer",
@@ -223,6 +227,7 @@
"wikibase-no-direct-editing": "Direkt redigering har inaktiverats i
namnområdet $1",
"wikibase-noentity": "Denna datamängd finns inte. Du kan <span
class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} söka
i de relaterade loggarna]</span>\nför att ta reda på var den tog vägen.",
"wikibase-noentity-createone": "Du kan också [[$1|skapa en ny]].",
+ "wikibase-special-mergeitems-error-prefix": "Objekten kunde inte
sammanfogas. Följande fel uppstod:",
"wikibase-item-summary-wbsetitem": "Skapade ett nytt objekt",
"wikibase-item-summary-wbcreate-new": "Skapade ett nytt objekt",
"wikibase-item-summary-wbeditentity": "Skapade ett nytt objekt",
@@ -250,19 +255,19 @@
"wikibase-item-summary-wbsetsitelink-remove": "Tog bort länk till [$2]",
"wikibase-item-summary-wblinktitles-create": "Skapade detta objekt för att
ansluta sidorna",
"wikibase-item-summary-wblinktitles-connect": "Lade till en språklänk för
att ansluta sidorna",
- "wikibase-item-summary-wbcreateclaim-value": "Skapade {{PLURAL:$1|ett
anspråk|anspråk}}",
- "wikibase-item-summary-wbcreateclaim-novalue": "Skapade {{PLURAL:$1|ett
anspråk|anspråk}}",
+ "wikibase-item-summary-wbcreateclaim-value": "Skapade {{PLURAL:$1|ett
påstående|påståenden}}",
+ "wikibase-item-summary-wbcreateclaim-novalue": "Skapade {{PLURAL:$1|ett
påstående|påståenden}}",
"wikibase-item-summary-wbcreateclaim-somevalue": "Skapade {{PLURAL:$1|ett
anspråk|anspråk}}",
- "wikibase-item-summary-wbcreateclaim": "Skapade {{PLURAL:$1|ett
anspråk|anspråk}}",
- "wikibase-item-summary-wbsetclaimvalue": "Angav {{PLURAL:$1|ett
anspråksvärde|anspråksvärden}}",
+ "wikibase-item-summary-wbcreateclaim": "Skapade {{PLURAL:$1|ett
påstående|påståenden}}",
+ "wikibase-item-summary-wbsetclaimvalue": "Angav {{PLURAL:$1|ett
påståendevärde|påståendevärden}}",
"wikibase-item-summary-wbremoveclaims": "Tog bort {{PLURAL:$1|ett
anspråk|anspråk}}",
"wikibase-item-summary-special-create-item": "Skapade en objekt för [$2]
med {{PLURAL:$1|värde|värden}}",
- "wikibase-item-summary-wbcreateclaim-create": "Skapade anspråk",
- "wikibase-item-summary-wbremoveclaims-remove": "Tog bort
{{PLURAL:$1|anspråk}}",
- "wikibase-item-summary-wbsetclaim-update": "Ändrade {{PLURAL:$3|anspråk}}",
+ "wikibase-item-summary-wbcreateclaim-create": "Skapade påstående",
+ "wikibase-item-summary-wbremoveclaims-remove": "Tog bort
{{PLURAL:$1|påstående|påståenden}}",
+ "wikibase-item-summary-wbsetclaim-update": "Ändrade
{{PLURAL:$3|påstående|påståenden}}",
"wikibase-item-summary-wbsetclaim-create": "Skapade {{PLURAL:$3|anspråk}}",
- "wikibase-item-summary-wbsetclaim-update-qualifiers": "Ändrade
{{PLURAL:$4|ett bestämningsord|$4 bestämningsord}} för {{PLURAL:$3|anspråk}}",
- "wikibase-item-summary-wbsetclaim-update-references": "Ändrade
{{PLURAL:$4|en referens|$4 referenser}} för {{PLURAL:$3|anspråk}}",
+ "wikibase-item-summary-wbsetclaim-update-qualifiers": "Ändrade
{{PLURAL:$4|ett bestämningsord|$4 bestämningsord}} för
{{PLURAL:$3|påstående|påståenden}}",
+ "wikibase-item-summary-wbsetclaim-update-references": "Ändrade
{{PLURAL:$4|en referens|$4 referenser}} för {{PLURAL:$3|påstående|påståenden}}",
"wikibase-item-summary-wbsetclaim-update-rank": "Ändrade rank för
{{PLURAL:$3|anspråk}}",
"wikibase-item-summary-clientsitelink-update": "Sida flyttades från [$3]
till [$4]",
"wikibase-item-summary-wbsetqualifier-add": "La till
{{PLURAL:$1|kvalifikator|kvalifikatorer}}",
@@ -310,4 +315,4 @@
"content-model-wikibase-query": "Wikibase-fråga",
"right-item-merge": "Sammanfoga objekt",
"right-property-create": "Skapa egenskaper"
-}
\ No newline at end of file
+}
diff --git a/extensions/Wikibase/repo/includes/ChangeOp/ChangeOpsMerge.php
b/extensions/Wikibase/repo/includes/ChangeOp/ChangeOpsMerge.php
index 1442f99..7a39281 100644
--- a/extensions/Wikibase/repo/includes/ChangeOp/ChangeOpsMerge.php
+++ b/extensions/Wikibase/repo/includes/ChangeOp/ChangeOpsMerge.php
@@ -34,7 +34,7 @@
* @var LabelDescriptionDuplicateDetector
*/
private $labelDescriptionDuplicateDetector;
-
+
/** @var SiteLinkLookup */
private $sitelinkLookup;
@@ -83,8 +83,14 @@
throw new InvalidArgumentException( '$ignoreConflicts
must be an array' );
}
foreach( $ignoreConflicts as $ignoreConflict ){
- if( $ignoreConflict !== 'label' && $ignoreConflict !==
'description' && $ignoreConflict !== 'sitelink' ){
- throw new InvalidArgumentException(
'$ignoreConflicts array can only contain "label", "description" and or
"sitelink" values' );
+ if(
+ $ignoreConflict !== 'label' &&
+ $ignoreConflict !== 'description' &&
+ $ignoreConflict !== 'sitelink'
+ ) {
+ throw new InvalidArgumentException(
+ '$ignoreConflicts array can only
contain "label", "description" and or "sitelink" values'
+ );
}
}
}
@@ -144,7 +150,13 @@
$siteId = $simpleSiteLink->getSiteId();
if( !$this->toItem->hasLinkToSite( $siteId ) ){
$this->fromChangeOps->add(
$this->changeOpFactory->newRemoveSiteLinkOp( $siteId ) );
- $this->toChangeOps->add(
$this->changeOpFactory->newSetSiteLinkOp( $siteId,
$simpleSiteLink->getPageName(), $simpleSiteLink->getBadges() ) );
+ $this->toChangeOps->add(
+
$this->changeOpFactory->newSetSiteLinkOp(
+ $siteId,
+ $simpleSiteLink->getPageName(),
+ $simpleSiteLink->getBadges()
+ )
+ );
} else {
if( !in_array( 'sitelink',
$this->ignoreConflicts ) ){
throw new ChangeOpException(
"Conflicting sitelinks for {$siteId}" );
@@ -174,7 +186,7 @@
}
/**
- * Finds a claim in the target entity with the same main snak and
qualifiers as the given $fromStatement
+ * Finds a claim in the target entity with the same main snak and
qualifiers as $fromStatement
*
* @param Statement $fromStatement
*
diff --git a/extensions/Wikibase/repo/includes/view/SnakHtmlGenerator.php
b/extensions/Wikibase/repo/includes/view/SnakHtmlGenerator.php
index 0d0a58d..57cc5b7 100644
--- a/extensions/Wikibase/repo/includes/view/SnakHtmlGenerator.php
+++ b/extensions/Wikibase/repo/includes/view/SnakHtmlGenerator.php
@@ -89,7 +89,7 @@
$propertyId = $snak->getPropertyId();
$propertyKey = $propertyId->getSerialization();
$propertyLabel = isset( $propertyLabels[$propertyKey] )
- ? $this->propertyLabels[$propertyKey]
+ ? $propertyLabels[$propertyKey]
: $propertyKey;
// @todo use EntityIdHtmlLinkFormatter here
diff --git a/vendor/autoload.php b/vendor/autoload.php
index dadb875..a3542e6 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit210d7a92d9650e4a3c0950e2909eb84d::getLoader();
+return ComposerAutoloaderInit8e60d31c57fb8e8bc6048366736c47e1::getLoader();
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index 0f195ff..fe398f6 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit210d7a92d9650e4a3c0950e2909eb84d
+class ComposerAutoloaderInit8e60d31c57fb8e8bc6048366736c47e1
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInit210d7a92d9650e4a3c0950e2909eb84d',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit8e60d31c57fb8e8bc6048366736c47e1',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInit210d7a92d9650e4a3c0950e2909eb84d',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit8e60d31c57fb8e8bc6048366736c47e1',
'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequire210d7a92d9650e4a3c0950e2909eb84d($file);
+ composerRequire8e60d31c57fb8e8bc6048366736c47e1($file);
}
return $loader;
}
}
-function composerRequire210d7a92d9650e4a3c0950e2909eb84d($file)
+function composerRequire8e60d31c57fb8e8bc6048366736c47e1($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 665bc43..72263a7 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -883,12 +883,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "28ba46099f9ddb5af036d5076e1818524ed4c525"
+ "reference": "8b521a7bdd79b6e6fe6ff88c16c4efbc03de62e1"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/28ba46099f9ddb5af036d5076e1818524ed4c525";,
- "reference": "28ba46099f9ddb5af036d5076e1818524ed4c525",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8b521a7bdd79b6e6fe6ff88c16c4efbc03de62e1";,
+ "reference": "8b521a7bdd79b6e6fe6ff88c16c4efbc03de62e1",
"shasum": ""
},
"require": {
@@ -907,7 +907,7 @@
"wikibase/data-model": "~0.7.2",
"wikibase/easyrdf_lite": "~0.8.1"
},
- "time": "2014-04-05 19:47:23",
+ "time": "2014-04-06 22:45:40",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/124295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81f1dd82c5eab897ce2bbdef3564a735393741fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
