IAlex has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/63338


Change subject: Remove "will be removed in ..." comments
......................................................................

Remove "will be removed in ..." comments

All of them are wrong, since 1.20 is out for a while now, and
these methods are still here.

Change-Id: I3b59b61490c9aea5252e25623b0b282295dcc3f6
---
M includes/OutputPage.php
M includes/Preferences.php
M includes/Title.php
M includes/parser/ParserOptions.php
4 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/38/63338/1

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 746cd0e..bb4604f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1296,7 +1296,6 @@
         * 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.
-        *     Will be removed in 1.20.
         * @return Boolean
         */
        public function isUserJsAllowed() {
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 972e2c6..bb386f2 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1476,7 +1476,7 @@
        }
 
        /**
-        * @deprecated in 1.19; will be removed in 1.20.
+        * @deprecated in 1.19
         * @param $user User
         * @return array
         */
diff --git a/includes/Title.php b/includes/Title.php
index 70e8cd4..c97056f 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2242,7 +2242,7 @@
         * Protect css subpages of user pages: can $wgUser edit
         * this page?
         *
-        * @deprecated in 1.19; will be removed in 1.20. Use 
getUserPermissionsErrors() instead.
+        * @deprecated in 1.19; use getUserPermissionsErrors() instead.
         * @return Bool
         */
        public function userCanEditCssSubpage() {
@@ -2256,7 +2256,7 @@
         * Protect js subpages of user pages: can $wgUser edit
         * this page?
         *
-        * @deprecated in 1.19; will be removed in 1.20. Use 
getUserPermissionsErrors() instead.
+        * @deprecated in 1.19; use getUserPermissionsErrors() instead.
         * @return Bool
         */
        public function userCanEditJsSubpage() {
@@ -2349,7 +2349,7 @@
        /**
         * Update the title protection status
         *
-        * @deprecated in 1.19; will be removed in 1.20. Use 
WikiPage::doUpdateRestrictions() instead.
+        * @deprecated in 1.19; use WikiPage::doUpdateRestrictions() instead.
         * @param $create_perm String Permission required for creation
         * @param string $reason Reason for protection
         * @param string $expiry Expiry timestamp
diff --git a/includes/parser/ParserOptions.php 
b/includes/parser/ParserOptions.php
index 2bd5a5d..b01f162 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -312,7 +312,7 @@
        function setAllowSpecialInclusion( $x )     { return wfSetVar( 
$this->mAllowSpecialInclusion, $x ); }
        function setTidy( $x )                      { return wfSetVar( 
$this->mTidy, $x ); }
 
-       /** @deprecated in 1.19; will be removed in 1.20 */
+       /** @deprecated in 1.19 */
        function setSkin( $x )                      { wfDeprecated( __METHOD__, 
'1.19' ); }
        function setInterfaceMessage( $x )          { return wfSetVar( 
$this->mInterfaceMessage, $x ); }
        function setTargetLanguage( $x )            { return wfSetVar( 
$this->mTargetLanguage, $x, true ); }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b59b61490c9aea5252e25623b0b282295dcc3f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to