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 "Http::getProxy() method to get proxy configuration"
[lhc/web/wiklou.git]
/
includes
/
page
/
CategoryPage.php
diff --git
a/includes/page/CategoryPage.php
b/includes/page/CategoryPage.php
index
9abc6a8
..
55fe156
100644
(file)
--- a/
includes/page/CategoryPage.php
+++ b/
includes/page/CategoryPage.php
@@
-29,6
+29,11
@@
class CategoryPage extends Article {
# Subclasses can change this to override the viewer class.
protected $mCategoryViewerClass = 'CategoryViewer';
# Subclasses can change this to override the viewer class.
protected $mCategoryViewerClass = 'CategoryViewer';
+ /**
+ * @var WikiCategoryPage
+ */
+ protected $mPage;
+
/**
* @param Title $title
* @return WikiCategoryPage
/**
* @param Title $title
* @return WikiCategoryPage
@@
-61,7
+66,7
@@
class CategoryPage extends Article {
return;
}
return;
}
- if ( !
wfRunHooks( 'CategoryPageView', array( &$this )
) ) {
+ if ( !
Hooks::run( 'CategoryPageView', [ &$this ]
) ) {
return;
}
return;
}
@@
-89,8
+94,8
@@
class CategoryPage extends Article {
$reqArray = $request->getValues();
$reqArray = $request->getValues();
- $from = $until =
array()
;
- foreach (
array( 'page', 'subcat', 'file' )
as $type ) {
+ $from = $until =
[]
;
+ foreach (
[ 'page', 'subcat', 'file' ]
as $type ) {
$from[$type] = $request->getVal( "{$type}from", $oldFrom );
$until[$type] = $request->getVal( "{$type}until", $oldUntil );
$from[$type] = $request->getVal( "{$type}from", $oldFrom );
$until[$type] = $request->getVal( "{$type}until", $oldUntil );
@@
-113,6
+118,8
@@
class CategoryPage extends Article {
$until,
$reqArray
);
$until,
$reqArray
);
- $this->getContext()->getOutput()->addHTML( $viewer->getHTML() );
+ $out = $this->getContext()->getOutput();
+ $out->addHTML( $viewer->getHTML() );
+ $this->addHelpLink( 'Help:Categories' );
}
}
}
}