From 01e6c38615e0afff3772e8938ffd4b72f8f44cef Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 27 Jun 2014 16:58:36 +0200 Subject: [PATCH] Remove OutputPage::isUserJsAllowed() (deprecated since 1.18) Change-Id: Ib56d22f49f229cb91b938b70e386d50c1e38e927 --- RELEASE-NOTES-1.24 | 1 + includes/OutputPage.php | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 5858739f60..215167f7a3 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -219,6 +219,7 @@ changes to languages because of Bugzilla reports. * Removed MWNamespace::isMain(). (deprecated since 1.19) * Removed Preferences::loadOldSearchNs(). (deprecated since 1.19) * Removed OutputPage::getStatusMessage(). (deprecated since 1.18) +* Removed OutputPage::isUserJsAllowed(). (deprecated since 1.18) ==== Renamed classes ==== * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression diff --git a/includes/OutputPage.php b/includes/OutputPage.php index b1a3ad51ac..89679382cf 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1342,18 +1342,6 @@ class OutputPage extends ContextSource { ); } - /** - * Return whether user JavaScript is allowed for this page - * @deprecated since 1.18 Load modules with ResourceLoader, and origin and - * trustworthiness is identified and enforced automagically. - * @return bool - */ - public function isUserJsAllowed() { - wfDeprecated( __METHOD__, '1.18' ); - return $this->getAllowedModules( ResourceLoaderModule::TYPE_SCRIPTS ) >= - ResourceLoaderModule::ORIGIN_USER_INDIVIDUAL; - } - /** * Show what level of JavaScript / CSS untrustworthiness is allowed on this page * @see ResourceLoaderModule::$origin -- 2.20.1