X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FCategoryViewer.php;h=facf847892a1193312a2430035760ca5858b3e1b;hb=df8f5cf4b16cf4a0590999d417e07a730e55fe1a;hp=c858dd7164f9b611e9c1f193dc449d5fce63193b;hpb=61898ad28ed69c5b391eb43e0db9386279b9612c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index c858dd7164..facf847892 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -67,7 +67,7 @@ class CategoryViewer extends ContextSource {
 	/** @var Collation */
 	public $collation;
 
-	/** @var ImageGallery */
+	/** @var ImageGalleryBase */
 	public $gallery;
 
 	/** @var Category Category object for this page. */
@@ -197,7 +197,11 @@ class CategoryViewer extends ContextSource {
 		$link = null;
 		Hooks::run( 'CategoryViewer::generateLink', [ $type, $title, $html, &$link ] );
 		if ( $link === null ) {
-			$link = Linker::link( $title, $html );
+			$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+			if ( $html !== null ) {
+				$html = new HtmlArmor( $html );
+			}
+			$link = $linkRenderer->makeLink( $title, $html );
 		}
 		if ( $isRedirect ) {
 			$link = '<span class="redirect-in-category">' . $link . '</span>';
@@ -422,26 +426,11 @@ class CategoryViewer extends ContextSource {
 		return $r;
 	}
 
-	/**
-	 * Return pretty name which is display name if given and different from prefix text or
-	 * the unprefixed page name.
-	 *
-	 * @return string HTML safe name.
-	 */
-	function getPrettyPageNameHtml() {
-		$displayTitle = $this->getOutput()->getPageTitle();
-		if ( $displayTitle === $this->getTitle()->getPrefixedText() ) {
-			return htmlspecialchars( $this->getTitle()->getText() );
-		} else {
-			return $displayTitle;
-		}
-	}
-
 	/**
 	 * @return string
 	 */
 	function getPagesSection() {
-		$name = $this->getPrettyPageNameHtml();
+		$ti = wfEscapeWikiText( $this->title->getText() );
 		# Don't show articles section if there are none.
 		$r = '';
 
@@ -457,7 +446,7 @@ class CategoryViewer extends ContextSource {
 
 		if ( $rescnt > 0 ) {
 			$r = "<div id=\"mw-pages\">\n";
-			$r .= '<h2>' . $this->msg( 'category_header' )->rawParams( $name )->parse() . "</h2>\n";
+			$r .= '<h2>' . $this->msg( 'category_header', $ti )->parse() . "</h2>\n";
 			$r .= $countmsg;
 			$r .= $this->getSectionPagingLinks( 'page' );
 			$r .= $this->formatList( $this->articles, $this->articles_start_char );
@@ -471,7 +460,6 @@ class CategoryViewer extends ContextSource {
 	 * @return string
 	 */
 	function getImageSection() {
-		$name = $this->getPrettyPageNameHtml();
 		$r = '';
 		$rescnt = $this->showGallery ? $this->gallery->count() : count( $this->imgsNoGallery );
 		$dbcnt = $this->cat->getFileCount();
@@ -481,7 +469,10 @@ class CategoryViewer extends ContextSource {
 		if ( $rescnt > 0 ) {
 			$r .= "<div id=\"mw-category-media\">\n";
 			$r .= '<h2>' .
-				$this->msg( 'category-media-header' )->rawParams( $name )->parse() .
+				$this->msg(
+					'category-media-header',
+					wfEscapeWikiText( $this->title->getText() )
+				)->text() .
 				"</h2>\n";
 			$r .= $countmsg;
 			$r .= $this->getSectionPagingLinks( 'file' );