Merge "Simplify HTMLTitleTextField::validate"

[lhc/web/wiklou.git] / includes / page / ImagePage.php

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 81677d4..d3d6da7 100644 (file)
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -272,18 +272,20 @@ class ImagePage extends Article {
        }
 
        /**
-        * Overloading Article's getContentObject method.
+        * Overloading Article's getEmptyPageParserOutput method.
         *
         * Omit noarticletext if sharedupload; text will be fetched from the
         * shared upload server if possible.
-        * @return string
+        *
+        * @param ParserOptions $options
+        * @return ParserOutput
         */
-       public function getContentObject() {
+       public function getEmptyPageParserOutput( ParserOptions $options ) {
                $this->loadFile();
                if ( $this->mPage->getFile() && !$this->mPage->getFile()->isLocal() && 0 == $this->getId() ) {
-                       return null;
+                       return new ParserOutput();
                }
-               return parent::getContentObject();
+               return parent::getEmptyPageParserOutput( $options );
        }
 
        private function getLanguageForRendering( WebRequest $request, File $file ) {
@@ -440,7 +442,7 @@ class ImagePage extends Article {
                                                // in the mediawiki.page.image.pagination module
                                                $link = Linker::linkKnown(
                                                        $this->getTitle(),
-                                                       $label,
+                                                       htmlspecialchars( $label ),
                                                        [],
                                                        [ 'page' => $page - 1 ]
                                                );
@@ -460,7 +462,7 @@ class ImagePage extends Article {
                                                $label = $this->getContext()->msg( 'imgmultipagenext' )->text();
                                                $link = Linker::linkKnown(
                                                        $this->getTitle(),
-                                                       $label,
+                                                       htmlspecialchars( $label ),
                                                        [],
                                                        [ 'page' => $page + 1 ]
                                                );