jenkins-bot has submitted this change and it was merged.
Change subject: Remove JSONContentHandler::$contentClass
......................................................................
Remove JSONContentHandler::$contentClass
Was deprecated in I70f1a3291.
Change-Id: I92d0fae344e158b9c46f2297c78a2e65fc3516db
---
M includes/content/JSONContentHandler.php
1 file changed, 1 insertion(+), 13 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/JSONContentHandler.php
b/includes/content/JSONContentHandler.php
index 33f2036..b0b7aae 100644
--- a/includes/content/JSONContentHandler.php
+++ b/includes/content/JSONContentHandler.php
@@ -13,27 +13,15 @@
*/
class JSONContentHandler extends TextContentHandler {
- /**
- * The class name of objects that should be created
- *
- * @deprecated override getContentClass instead
- *
- * @var string
- */
- protected $contentClass = 'JSONContent';
-
public function __construct( $modelId = CONTENT_MODEL_JSON ) {
parent::__construct( $modelId, array( CONTENT_FORMAT_JSON ) );
}
/**
- * Temporary back-compat until extensions
- * are updated to override this
- *
* @return string
*/
protected function getContentClass() {
- return $this->contentClass;
+ return 'JSONContent';
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/157772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92d0fae344e158b9c46f2297c78a2e65fc3516db
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
