From 5adacd4138b3fdc20e263ffcf765ad0f4f5a6b57 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Fri, 30 Sep 2016 10:07:24 -0400 Subject: [PATCH] ApiBase: Remove deprecated getResultData() It was broken by I3ca7c981, and should probably have been removed in that patch too. Change-Id: I66ce52348406372a09d39f9d876123026f6c2bad --- RELEASE-NOTES-1.28 | 1 + includes/api/ApiBase.php | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index a24f97a1f6..508d00b7ef 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -114,6 +114,7 @@ production. interact with ApiParse and ApiExpandTemplates. * (T139565) SECURITY: API: Generate head items in the context of the given title * (T115333) SECURITY: Check read permission when loading page content in ApiParse +* ApiBase::getResultData() was removed (deprecated since 1.25) * ApiBase::makeHelpArrayToString() was removed (deprecated since 1.25) * ApiBase::makeHelpMsgParameters() was removed (deprecated since 1.25) * ApiBase::makeHelpMsg() was removed (deprecated since 1.25) diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 809d5676b7..bf33838add 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -2745,16 +2745,6 @@ abstract class ApiBase extends ContextSource { return 0; } - /** - * Get the result data array (read-only) - * @deprecated since 1.25, use $this->getResult() methods instead - * @return array - */ - public function getResultData() { - wfDeprecated( __METHOD__, '1.25' ); - return $this->getResult()->getData(); - } - /** * Call wfTransactionalTimeLimit() if this request was POSTed * @since 1.26 -- 2.20.1