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 "parser: list the vary-* flags in the NewPP report HTML comment"
[lhc/web/wiklou.git]
/
includes
/
CategoryViewer.php
diff --git
a/includes/CategoryViewer.php
b/includes/CategoryViewer.php
index
46a1473
..
f78597b
100644
(file)
--- a/
includes/CategoryViewer.php
+++ b/
includes/CategoryViewer.php
@@
-125,7
+125,7
@@
class CategoryViewer extends ContextSource {
// @todo FIXME: Cannot be completely suppressed because it
// is unknown if 'until' or 'from' makes this
// give 0 results.
// @todo FIXME: Cannot be completely suppressed because it
// is unknown if 'until' or 'from' makes this
// give 0 results.
- $r = $
r . $
this->getCategoryTop();
+ $r = $this->getCategoryTop();
} else {
$r = $this->getCategoryTop() .
$r .
} else {
$r = $this->getCategoryTop() .
$r .
@@
-339,7
+339,7
@@
class CategoryViewer extends ContextSource {
'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey',
],
[
'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey',
],
[
- 'categorylinks' => [ '
INNER
JOIN', 'cl_from = page_id' ],
+ 'categorylinks' => [ 'JOIN', 'cl_from = page_id' ],
'category' => [ 'LEFT JOIN', [
'cat_title = page_title',
'page_namespace' => NS_CATEGORY
'category' => [ 'LEFT JOIN', [
'cat_title = page_title',
'page_namespace' => NS_CATEGORY
@@
-424,7
+424,7
@@
class CategoryViewer extends ContextSource {
* @return string
*/
function getPagesSection() {
* @return string
*/
function getPagesSection() {
- $
ti = wfEscapeWikiText( $this->title->getText()
);
+ $
name = $this->getOutput()->getUnprefixedDisplayTitle(
);
# Don't show articles section if there are none.
$r = '';
# Don't show articles section if there are none.
$r = '';
@@
-440,7
+440,7
@@
class CategoryViewer extends ContextSource {
if ( $rescnt > 0 ) {
$r = "<div id=\"mw-pages\">\n";
if ( $rescnt > 0 ) {
$r = "<div id=\"mw-pages\">\n";
- $r .= '<h2>' . $this->msg( 'category_header'
, $ti
)->parse() . "</h2>\n";
+ $r .= '<h2>' . $this->msg( 'category_header'
)->rawParams( $name
)->parse() . "</h2>\n";
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'page' );
$r .= $this->formatList( $this->articles, $this->articles_start_char );
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'page' );
$r .= $this->formatList( $this->articles, $this->articles_start_char );
@@
-454,6
+454,7
@@
class CategoryViewer extends ContextSource {
* @return string
*/
function getImageSection() {
* @return string
*/
function getImageSection() {
+ $name = $this->getOutput()->getUnprefixedDisplayTitle();
$r = '';
$rescnt = $this->showGallery ? $this->gallery->count() : count( $this->imgsNoGallery );
$dbcnt = $this->cat->getFileCount();
$r = '';
$rescnt = $this->showGallery ? $this->gallery->count() : count( $this->imgsNoGallery );
$dbcnt = $this->cat->getFileCount();
@@
-463,10
+464,7
@@
class CategoryViewer extends ContextSource {
if ( $rescnt > 0 ) {
$r .= "<div id=\"mw-category-media\">\n";
$r .= '<h2>' .
if ( $rescnt > 0 ) {
$r .= "<div id=\"mw-category-media\">\n";
$r .= '<h2>' .
- $this->msg(
- 'category-media-header',
- wfEscapeWikiText( $this->title->getText() )
- )->text() .
+ $this->msg( 'category-media-header' )->rawParams( $name )->parse() .
"</h2>\n";
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'file' );
"</h2>\n";
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'file' );