dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Proper handling of invalid/unknown time zones"
[lhc/web/wiklou.git]
/
includes
/
page
/
CategoryPage.php
diff --git
a/includes/page/CategoryPage.php
b/includes/page/CategoryPage.php
index
865471c
..
ccc50f7
100644
(file)
--- a/
includes/page/CategoryPage.php
+++ b/
includes/page/CategoryPage.php
@@
-54,7
+54,10
@@
class CategoryPage extends Article {
return;
}
return;
}
- if ( !Hooks::run( 'CategoryPageView', [ &$this ] ) ) {
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $categoryPage = $this;
+
+ if ( !Hooks::run( 'CategoryPageView', [ &$categoryPage ] ) ) {
return;
}
return;
}
@@
-68,6
+71,10
@@
class CategoryPage extends Article {
if ( $title->inNamespace( NS_CATEGORY ) ) {
$this->closeShowCategory();
}
if ( $title->inNamespace( NS_CATEGORY ) ) {
$this->closeShowCategory();
}
+
+ # Use adaptive TTLs for CDN so delayed/failed purges are noticed less often
+ $outputPage = $this->getContext()->getOutput();
+ $outputPage->adaptCdnTTL( $this->mPage->getTouched(), IExpiringStore::TTL_MINUTE );
}
function openShowCategory() {
}
function openShowCategory() {