jenkins-bot has submitted this change and it was merged.

Change subject: Also show Statements on Properties in non-experimental mode
......................................................................


Also show Statements on Properties in non-experimental mode

Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
(cherry picked from commit e92535ce71e5391ee8bf3d0717f384babe351716)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M repo/includes/PropertyView.php
2 files changed, 6 insertions(+), 12 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index dbdb1d4..2c462cc 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -103,10 +103,7 @@
 
                // TODO: Have an itemview and propertyview instead of ugly hack 
here.
                var entityType = this.options.value.getType();
-               if(
-                       entityType === 'item'
-                       || entityType === 'property' && mw.config.get( 
'wbExperimentalFeatures' )
-               ) {
+               if( entityType === 'item' || entityType === 'property' ) {
                        this._initClaims();
                }
 
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index 6e8786b..a5b71e6 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -36,14 +36,11 @@
                $html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
                $html .= $this->getHtmlForDataType( $this->getDataType( 
$property ) );
 
-               if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && 
WB_EXPERIMENTAL_FEATURES ) {
-                       // @fixme Property::getClaims no longer returns any 
statements for properties!
-                       $html .= $this->claimsView->getHtml(
-                               $property->getStatements()->toArray(),
-                               $entityInfo,
-                               'wikibase-attributes'
-                       );
-               }
+               $html .= $this->claimsView->getHtml(
+                       $property->getStatements()->toArray(),
+                       $entityInfo,
+                       'wikibase-attributes'
+               );
 
                $footer = wfMessage( 'wikibase-property-footer' );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/176250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf10
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to