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
Remove SpecialSearchNoResults and call SpecialSearchResults always
[lhc/web/wiklou.git]
/
includes
/
CategoryViewer.php
diff --git
a/includes/CategoryViewer.php
b/includes/CategoryViewer.php
index
ec8efae
..
60694c9
100644
(file)
--- a/
includes/CategoryViewer.php
+++ b/
includes/CategoryViewer.php
@@
-87,12
+87,11
@@
class CategoryViewer extends ContextSource {
function __construct( $title, IContextSource $context, $from = array(),
$until = array(), $query = array()
) {
function __construct( $title, IContextSource $context, $from = array(),
$until = array(), $query = array()
) {
- global $wgCategoryPagingLimit;
$this->title = $title;
$this->setContext( $context );
$this->from = $from;
$this->until = $until;
$this->title = $title;
$this->setContext( $context );
$this->from = $from;
$this->until = $until;
- $this->limit = $
wgCategoryPagingLimit
;
+ $this->limit = $
context->getConfig()->get( 'CategoryPagingLimit' )
;
$this->cat = Category::newFromTitle( $title );
$this->query = $query;
$this->collation = Collation::singleton();
$this->cat = Category::newFromTitle( $title );
$this->query = $query;
$this->collation = Collation::singleton();
@@
-105,10
+104,10
@@
class CategoryViewer extends ContextSource {
* @return string HTML output
*/
public function getHTML() {
* @return string HTML output
*/
public function getHTML() {
- global $wgCategoryMagicGallery;
wfProfileIn( __METHOD__ );
wfProfileIn( __METHOD__ );
- $this->showGallery = $wgCategoryMagicGallery && !$this->getOutput()->mNoGallery;
+ $this->showGallery = $this->getConfig()->get( 'CategoryMagicGallery' )
+ && !$this->getOutput()->mNoGallery;
$this->clearCategoryState();
$this->doCategoryQuery();
$this->clearCategoryState();
$this->doCategoryQuery();