Wctaiwan has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/142202

Change subject: Use Html class for generating displayed list
......................................................................

Use Html class for generating displayed list

Change-Id: I853f4207db18d02b0603c3b283e3e66409d93f1d
---
M includes/content/MassMessageListContent.php
1 file changed, 14 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage 
refs/changes/02/142202/1

diff --git a/includes/content/MassMessageListContent.php 
b/includes/content/MassMessageListContent.php
index d37b87f..e17865e 100644
--- a/includes/content/MassMessageListContent.php
+++ b/includes/content/MassMessageListContent.php
@@ -132,13 +132,15 @@
        protected function getTargetsHtml() {
                global $wgScript;
 
-               $html = '<h2>' . wfMessage( 'massmessage-content-pages' 
)->parse() . "</h2>\n";
+               $html = Html::rawElement( 'h2', array(),
+                       wfMessage( 'massmessage-content-pages' )->parse() );
 
                $sites = $this->getTargetsBySite();
 
                // If the list is empty
                if ( count( $sites ) === 0 ) {
-                       $html .= '<p>' . wfMessage( 'massmessage-content-empty' 
)->parse() . "</p>\n";
+                       $html .= Html::rawElement( 'p', array(),
+                               wfMessage( 'massmessage-content-empty' 
)->parse() );
                        return $html;
                }
 
@@ -149,28 +151,27 @@
                foreach ( $sites as $site => $targets ) {
                        if ( $printSites ) {
                                if ( $site === 'local' ) {
-                                       $html .= '<p>' . wfMessage( 
'massmessage-content-localpages' )->parse()
-                                               . "</p>\n";
+                                       $html .= Html::rawElement( 'p', array(),
+                                               wfMessage( 
'massmessage-content-localpages' )->parse() );
                                } else {
-                                       $html .= '<p>'
-                                               . wfMessage( 
'massmessage-content-pagesonsite', $site )->parse()
-                                               . "</p>\n";
+                                       $html .= Html::rawElement( 'p', array(),
+                                               wfMessage( 
'massmessage-content-pagesonsite', $site )->parse() );
                                }
                        }
 
-                       $html .= "<ul>\n";
+                       $html .= Html::openElement( 'ul' );
                        foreach ( $targets as $target ) {
                                if ( $site === 'local' ) {
-                                       $html .= '<li>' . Linker::link( 
Title::newFromText( $target ) ) . "</li>\n";
+                                       $html .= Html::rawElement( 'li', 
array(),
+                                               Linker::link( 
Title::newFromText( $target ) ) );
                                } else {
                                        $title = Title::newFromText( $target );
                                        $url = "//$site$wgScript?title=" . 
$title->getPrefixedURL();
-                                       $html .= '<li>'
-                                               . Linker::makeExternalLink( 
$url, $title->getPrefixedText() )
-                                               . "</li>\n";
+                                       $html .= Html::rawElement( 'li', 
array(),
+                                               Linker::makeExternalLink( $url, 
$title->getPrefixedText() ) );
                                }
                        }
-                       $html .= "</ul>\n";
+                       $html .= Html::closeElement( 'ul' );
                }
 
                return $html;

-- 
To view, visit https://gerrit.wikimedia.org/r/142202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I853f4207db18d02b0603c3b283e3e66409d93f1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Wctaiwan <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to