Merge "Improve readability of LogFormatter::makePageLink"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 9 Jan 2019 23:36:27 +0000 (23:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 9 Jan 2019 23:36:27 +0000 (23:36 +0000)
includes/logging/LogFormatter.php

index b3afe0b..b07f20e 100644 (file)
@@ -644,18 +644,18 @@ class LogFormatter {
        protected function makePageLink( Title $title = null, $parameters = [], $html = null ) {
                if ( !$title instanceof Title ) {
                        $msg = $this->msg( 'invalidtitle' )->text();
-                       if ( !$this->plaintext ) {
-                               return Html::element( 'span', [ 'class' => 'mw-invalidtitle' ], $msg );
-                       } else {
+                       if ( $this->plaintext ) {
                                return $msg;
+                       } else {
+                               return Html::element( 'span', [ 'class' => 'mw-invalidtitle' ], $msg );
                        }
                }
 
-               if ( !$this->plaintext ) {
+               if ( $this->plaintext ) {
+                       $link = '[[' . $title->getPrefixedText() . ']]';
+               } else {
                        $html = $html !== null ? new HtmlArmor( $html ) : $html;
                        $link = $this->getLinkRenderer()->makeLink( $title, $html, [], $parameters );
-               } else {
-                       $link = '[[' . $title->getPrefixedText() . ']]';
                }
 
                return $link;