X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fpage%2FImagePage.php;h=639cbd07d69bf7521e268c6c772e8d836ffb180e;hb=5fa4cdf860c79b32ab6ef034c6d9420c2727f695;hp=b870831e5fba3ecd68889d748284bd7ac5a08b8b;hpb=fb79f30319b9ad2a7eb0f5f4d1668143ec8f963e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index b870831e5f..639cbd07d6 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -621,8 +621,8 @@ EOT
 	/**
 	 * Make the text under the image to say what size preview
 	 *
-	 * @param $params array parameters for thumbnail
-	 * @param $sizeLinkBigImagePreview HTML for the current size
+	 * @param array $params parameters for thumbnail
+	 * @param string $sizeLinkBigImagePreview HTML for the current size
 	 * @return string HTML output
 	 */
 	private function getThumbPrevText( $params, $sizeLinkBigImagePreview ) {
@@ -963,7 +963,7 @@ EOT
 				$fromSrc = $this->getContext()->msg(
 					'shared-repo-from',
 					$file->getRepo()->getDisplayName()
-				)->text();
+				)->escaped();
 			}
 			$out->addHTML( "<li>{$link} {$fromSrc}</li>\n" );
 		}
@@ -1054,8 +1054,8 @@ EOT
 	protected function doRenderLangOpt( array $langChoices, $curLang, $defaultLang ) {
 		global $wgScript;
 		sort( $langChoices );
-		$curLang = wfBCP47( $curLang );
-		$defaultLang = wfBCP47( $defaultLang );
+		$curLang = LanguageCode::bcp47( $curLang );
+		$defaultLang = LanguageCode::bcp47( $defaultLang );
 		$opts = '';
 		$haveCurrentLang = false;
 		$haveDefaultLang = false;
@@ -1067,7 +1067,7 @@ EOT
 		// include a choice for that. Last of all, if we're viewing
 		// the file in a language not on the list, add it as a choice.
 		foreach ( $langChoices as $lang ) {
-			$code = wfBCP47( $lang );
+			$code = LanguageCode::bcp47( $lang );
 			$name = Language::fetchLanguageName( $code, $this->getContext()->getLanguage()->getCode() );
 			if ( $name !== '' ) {
 				$display = $this->getContext()->msg( 'img-lang-opt', $code, $name )->text();