jenkins-bot has submitted this change and it was merged.
Change subject: Remove broken and unnecessary execution guards
......................................................................
Remove broken and unnecessary execution guards
Change-Id: If76bf0d0079f14f99f47cef145b1e25381d9edc2
---
M classes/Dispatch.php
M classes/HistoricalThread.php
M classes/NewMessagesController.php
M classes/Thread.php
M classes/ThreadRevision.php
M pages/NewUserMessagesView.php
M pages/SummaryPageView.php
M pages/TalkpageHeaderView.php
M pages/ThreadActionPage.php
M pages/ThreadDiffView.php
M pages/ThreadHistoricalRevisionView.php
M pages/ThreadProtectionFormView.php
M pages/ThreadWatchView.php
13 files changed, 2 insertions(+), 11 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/classes/Dispatch.php b/classes/Dispatch.php
index ca79fee..d997624 100644
--- a/classes/Dispatch.php
+++ b/classes/Dispatch.php
@@ -1,4 +1,5 @@
<?php
+
class LqtDispatch {
/** static cache of per-page LiquidThreads activation setting */
static $userLqtOverride = array();
diff --git a/classes/HistoricalThread.php b/classes/HistoricalThread.php
index d980bd7..8dc4f28 100644
--- a/classes/HistoricalThread.php
+++ b/classes/HistoricalThread.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class HistoricalThread extends Thread {
/* Information about what changed in this revision. */
diff --git a/classes/NewMessagesController.php
b/classes/NewMessagesController.php
index 56bf082..e9aab83 100644
--- a/classes/NewMessagesController.php
+++ b/classes/NewMessagesController.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class NewMessages {
static function markThreadAsUnreadByUser( $thread, $user ) {
diff --git a/classes/Thread.php b/classes/Thread.php
index d2a04ce..88a8840 100644
--- a/classes/Thread.php
+++ b/classes/Thread.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class Thread {
/* SCHEMA changes must be reflected here. */
diff --git a/classes/ThreadRevision.php b/classes/ThreadRevision.php
index ae3d9a8..c46e40f 100644
--- a/classes/ThreadRevision.php
+++ b/classes/ThreadRevision.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class ThreadRevision {
static $load =
diff --git a/pages/NewUserMessagesView.php b/pages/NewUserMessagesView.php
index 6edf23a..d2270f2 100644
--- a/pages/NewUserMessagesView.php
+++ b/pages/NewUserMessagesView.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class NewUserMessagesView extends LqtView {
protected $highlightedThreads;
diff --git a/pages/SummaryPageView.php b/pages/SummaryPageView.php
index 2b55ca0..d71080e 100644
--- a/pages/SummaryPageView.php
+++ b/pages/SummaryPageView.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class SummaryPageView extends LqtView {
function show() {
diff --git a/pages/TalkpageHeaderView.php b/pages/TalkpageHeaderView.php
index f1909e5..99ee6a3 100644
--- a/pages/TalkpageHeaderView.php
+++ b/pages/TalkpageHeaderView.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
// Pass-through wrapper with an extra note at the top
class TalkpageHeaderView extends LqtView {
diff --git a/pages/ThreadActionPage.php b/pages/ThreadActionPage.php
index 58031eb..c328698 100644
--- a/pages/ThreadActionPage.php
+++ b/pages/ThreadActionPage.php
@@ -1,4 +1,5 @@
<?php
+
abstract class ThreadActionPage extends UnlistedSpecialPage {
protected $user, $output, $request, $title, $mThread;
diff --git a/pages/ThreadDiffView.php b/pages/ThreadDiffView.php
index d8f827f..8cfe326 100644
--- a/pages/ThreadDiffView.php
+++ b/pages/ThreadDiffView.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class ThreadDiffView extends LqtView {
function customizeNavigation( $skin, &$links ) {
diff --git a/pages/ThreadHistoricalRevisionView.php
b/pages/ThreadHistoricalRevisionView.php
index 89b09f0..e6d59f1 100644
--- a/pages/ThreadHistoricalRevisionView.php
+++ b/pages/ThreadHistoricalRevisionView.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class ThreadHistoricalRevisionView extends ThreadPermalinkView {
public $mDisplayRevision = null;
diff --git a/pages/ThreadProtectionFormView.php
b/pages/ThreadProtectionFormView.php
index c233af5..c63b488 100644
--- a/pages/ThreadProtectionFormView.php
+++ b/pages/ThreadProtectionFormView.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
// Pass-through wrapper
class ThreadProtectionFormView extends LqtView {
diff --git a/pages/ThreadWatchView.php b/pages/ThreadWatchView.php
index 00aa1fb..7ee7ee8 100644
--- a/pages/ThreadWatchView.php
+++ b/pages/ThreadWatchView.php
@@ -1,5 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class ThreadWatchView extends LqtView {
function show() {
--
To view, visit https://gerrit.wikimedia.org/r/174921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If76bf0d0079f14f99f47cef145b1e25381d9edc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
