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 "Remove incorrect timezone conversion from date parameters"
[lhc/web/wiklou.git]
/
includes
/
page
/
Article.php
diff --git
a/includes/page/Article.php
b/includes/page/Article.php
index
abf32d7
..
3a7b18e
100644
(file)
--- a/
includes/page/Article.php
+++ b/
includes/page/Article.php
@@
-733,7
+733,7
@@
class Article implements Page {
);
// DifferenceEngine directly fetched the revision:
);
// DifferenceEngine directly fetched the revision:
- $this->mRevIdFetched = $de->
mNewid
;
+ $this->mRevIdFetched = $de->
getNewid()
;
$de->showDiffPage( $diffOnly );
// Run view updates for the newer revision being diffed (and shown
$de->showDiffPage( $diffOnly );
// Run view updates for the newer revision being diffed (and shown
@@
-750,7
+750,7
@@
class Article implements Page {
* @return array The policy that should be set
* @todo actions other than 'view'
*/
* @return array The policy that should be set
* @todo actions other than 'view'
*/
- public function getRobotPolicy( $action, $pOutput = null ) {
+ public function getRobotPolicy( $action,
ParserOutput
$pOutput = null ) {
global $wgArticleRobotPolicies, $wgNamespaceRobotPolicies, $wgDefaultRobotPolicy;
$ns = $this->getTitle()->getNamespace();
global $wgArticleRobotPolicies, $wgNamespaceRobotPolicies, $wgDefaultRobotPolicy;
$ns = $this->getTitle()->getNamespace();
@@
-976,6
+976,11
@@
class Article implements Page {
public function showPatrolFooter() {
global $wgUseNPPatrol, $wgUseRCPatrol, $wgUseFilePatrol;
public function showPatrolFooter() {
global $wgUseNPPatrol, $wgUseRCPatrol, $wgUseFilePatrol;
+ // Allow hooks to decide whether to not output this at all
+ if ( !Hooks::run( 'ArticleShowPatrolFooter', [ $this ] ) ) {
+ return false;
+ }
+
$outputPage = $this->getContext()->getOutput();
$user = $this->getContext()->getUser();
$title = $this->getTitle();
$outputPage = $this->getContext()->getOutput();
$user = $this->getContext()->getUser();
$title = $this->getTitle();