jenkins-bot has submitted this change and it was merged.
Change subject: Kill $wgArticle
......................................................................
Kill $wgArticle
This has been deprecated since 1.18, throwing warnings for over a
year and a half now, and nothing uses it anywhere in core or deployed
extensions.
No extensions in SVN seem to have this anymore (we must've cleaned
up well), and the only affected extensions in Git are:
- BlueSpiceExtensions
- DynamicPageList (commented, so shouldn't be a worry)
- SemanticPageMaker
- TwitterCards
If you're the author of one of these extensions or are feeling like
cleaning up ancient code, please get them fixed.
Change-Id: I8f3a54c14be4b38a8b917e32ba3a832e0a7ca116
---
M RELEASE-NOTES-1.23
M docs/hooks.txt
M includes/DeprecatedGlobal.php
M includes/Wiki.php
4 files changed, 2 insertions(+), 9 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 6c78253..c9b56b9 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -34,6 +34,7 @@
changes to languages because of Bugzilla reports.
=== Other changes in 1.23 ===
+* The global variable $wgArticle has been removed after a lengthy deprecation
== Compatibility ==
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 84888d2..96a72df 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1608,7 +1608,7 @@
something completely different, after the basic globals have been set up, but
before ordinary actions take place.
$output: $wgOut
-$article: $wgArticle
+$article: Article on which the action will be performed
$title: $wgTitle
$user: $wgUser
$request: $wgRequest
diff --git a/includes/DeprecatedGlobal.php b/includes/DeprecatedGlobal.php
index d48bd0b..8a63786 100644
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@ -23,7 +23,6 @@
/**
* Class to allow throwing wfDeprecated warnings
* when people use globals that we do not want them to.
- * (For example like $wgArticle)
*/
class DeprecatedGlobal extends StubObject {
diff --git a/includes/Wiki.php b/includes/Wiki.php
index 08567ee..a690176 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -302,13 +302,6 @@
$article = $this->initializeArticle();
if ( is_object( $article ) ) {
$pageView = true;
- /**
- * $wgArticle is deprecated, do not use it.
- * @deprecated since 1.18
- */
- global $wgArticle;
- $wgArticle = new DeprecatedGlobal( 'wgArticle',
$article, '1.18' );
-
$this->performAction( $article, $requestTitle );
} elseif ( is_string( $article ) ) {
$output->redirect( $article );
--
To view, visit https://gerrit.wikimedia.org/r/93106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f3a54c14be4b38a8b917e32ba3a832e0a7ca116
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
