From 6ce974f95f5f68bfd65d849a01b6488f604510ee Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Tue, 10 May 2016 17:13:47 -0700 Subject: [PATCH] Pass the OutputPage object to the OutputPageCheckLastModified hook So that the hook function has a ContextSource. Change-Id: I044a5920b703a2d61a74c2d83d184b77caebb8f3 --- docs/hooks.txt | 1 + includes/OutputPage.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/hooks.txt b/docs/hooks.txt index a7092ec9e1..ab099b0898 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -2128,6 +2128,7 @@ $sk: The Skin that called OutputPage::headElement since the last visit. &$modifiedTimes: array of timestamps. The following keys are set: page, user, epoch +$out: OutputPage object (since 1.28) 'OutputPageMakeCategoryLinks': Links are about to be generated for the page's categories. Implementations should return false if they generate the category diff --git a/includes/OutputPage.php b/includes/OutputPage.php index c724207034..67e9a4ff82 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -780,7 +780,7 @@ class OutputPage extends ContextSource { // bug 44570: the core page itself may not change, but resources might $modifiedTimes['sepoch'] = wfTimestamp( TS_MW, time() - $config->get( 'SquidMaxage' ) ); } - Hooks::run( 'OutputPageCheckLastModified', [ &$modifiedTimes ] ); + Hooks::run( 'OutputPageCheckLastModified', [ &$modifiedTimes, $this ] ); $maxModified = max( $modifiedTimes ); $this->mLastModified = wfTimestamp( TS_RFC2822, $maxModified ); -- 2.20.1