Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356899 )
Change subject: Break long lines
......................................................................
Break long lines
Prepare to make phpcs pass
Change-Id: Ia76272aa3d80d2e19b9b9890908da93099aa8701
---
M api/ApiQueryLQTThreads.php
M api/ApiThreadAction.php
M classes/Hooks.php
M classes/Thread.php
M classes/ThreadHistoryPager.php
M classes/View.php
M pages/TalkpageView.php
M pages/ThreadActionPage.php
8 files changed, 159 insertions(+), 66 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads
refs/changes/99/356899/1
diff --git a/api/ApiQueryLQTThreads.php b/api/ApiQueryLQTThreads.php
index 1208ee3..be0614d 100644
--- a/api/ApiQueryLQTThreads.php
+++ b/api/ApiQueryLQTThreads.php
@@ -160,7 +160,9 @@
'thread_id',
'thread_parent',
'replies',
- function($row) { return array( $row->thread_id
=> array( 'id' => $row->thread_id ) ); },
+ function ( $row ) {
+ return array( $row->thread_id => array(
'id' => $row->thread_id ) );
+ },
'reply'
);
}
@@ -168,7 +170,9 @@
$result->addIndexedTagName( array( 'query',
$this->getModuleName() ), 'thread' );
}
- protected function addSubItems( $tableName, $fields, $joinField,
$subitemName, /*callable*/ $handleRow, $tagName ) {
+ protected function addSubItems(
+ $tableName, $fields, $joinField, $subitemName, /*callable*/
$handleRow, $tagName
+ ) {
$dbr = wfGetDB( DB_SLAVE );
$result = $this->getResult();
diff --git a/api/ApiThreadAction.php b/api/ApiThreadAction.php
index 658200f..3f66907 100644
--- a/api/ApiThreadAction.php
+++ b/api/ApiThreadAction.php
@@ -27,14 +27,18 @@
if ( $threadObj instanceof Thread ) {
$threads[] = $threadObj;
- if ( !in_array( $action,
$actionsAllowedOnNonLqtPage ) && !LqtDispatch::isLqtPage(
$threadObj->getTitle() ) ) {
+ if ( !in_array( $action,
$actionsAllowedOnNonLqtPage )
+ && !LqtDispatch::isLqtPage(
$threadObj->getTitle() )
+ ) {
$articleTitleDBKey =
$threadObj->getTitle()->getDBkey();
if ( is_callable( [ $this,
'dieWithError' ] ) ) {
- $this->dieWithError(
- [
'lqt-not-a-liquidthreads-page', wfEscapeWikiText( $articleTitleDBKey ) ]
- );
+ $this->dieWithError( [
+
'lqt-not-a-liquidthreads-page',
+
wfEscapeWikiText( $articleTitleDBKey )
+ ] );
} else {
- $message = wfMessage(
'lqt-not-a-liquidthreads-page', $articleTitleDBKey )->text();
+ $message = wfMessage(
+
'lqt-not-a-liquidthreads-page', $articleTitleDBKey )->text();
$this->dieUsageMsg(
$message );
}
}
@@ -85,9 +89,11 @@
);
}
$newMessagesCount = NewMessages::newMessageCount(
$user, DB_MASTER );
- $result[count( $result ) - 1]['unreadlink'] = array( //
Only bother to put this on the last threadaction
+ $msgNewMessages = $newMessagesCount ?
'lqt-newmessages-n' : 'lqt_newmessages';
+ // Only bother to put this on the last threadaction
+ $result[count( $result ) - 1]['unreadlink'] = array(
'href' => SpecialPage::getTitleFor(
'NewMessages' )->getLocalURL(),
- 'text' => wfMessage( $newMessagesCount ?
'lqt-newmessages-n' : 'lqt_newmessages' )->numParams( $newMessagesCount
)->text(),
+ 'text' => wfMessage( $msgNewMessages
)->numParams( $newMessagesCount )->text(),
'active' => $newMessagesCount > 0,
);
}
@@ -126,7 +132,8 @@
}
} elseif ( count( $threads ) < 1 ) {
if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-liquidthreads-threadneeded', 'no-specified-threads' );
+ $this->dieWithError(
+ 'apierror-liquidthreads-threadneeded',
'no-specified-threads' );
} else {
$this->dieUsage( 'You must specify a thread to
split',
'no-specified-threads' );
@@ -299,7 +306,8 @@
$user = $this->getUser();
if ( Thread::canUserPost( $user, $talkpage ) !== true ) {
if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-liquidthreads-talkpageprotected', 'talkpage-protected' );
+ $this->dieWithError(
+
'apierror-liquidthreads-talkpageprotected', 'talkpage-protected' );
} else {
$this->dieUsage( 'You cannot post to the
specified talkpage, ' .
'because it is protected from new
posts', 'talkpage-protected' );
@@ -427,7 +435,8 @@
}
} elseif ( count( $threads ) < 1 ) {
if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-liquidthreads-threadneeded', 'no-specified-threads' );
+ $this->dieWithError(
+ 'apierror-liquidthreads-threadneeded',
'no-specified-threads' );
} else {
$this->dieUsage( 'You must specify a thread to
edit',
'no-specified-threads' );
@@ -556,7 +565,8 @@
}
} elseif ( count( $threads ) < 1 ) {
if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-liquidthreads-threadneeded', 'no-specified-threads' );
+ $this->dieWithError(
+ 'apierror-liquidthreads-threadneeded',
'no-specified-threads' );
} else {
$this->dieUsage( 'You must specify a thread to
reply to',
'no-specified-threads' );
@@ -726,7 +736,8 @@
}
} elseif ( count( $threads ) < 1 ) {
if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-liquidthreads-threadneeded', 'no-specified-threads' );
+ $this->dieWithError(
+ 'apierror-liquidthreads-threadneeded',
'no-specified-threads' );
} else {
$this->dieUsage( 'You must specify a thread to
change the subject of',
'no-specified-threads' );
diff --git a/classes/Hooks.php b/classes/Hooks.php
index ae1b177..b926022 100644
--- a/classes/Hooks.php
+++ b/classes/Hooks.php
@@ -50,7 +50,9 @@
// Custom display for new posts.
if ( $rc->mAttribs['rc_new'] ) {
// Article link, timestamp, user
- $s =
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
$thread->getTitle() );
+ $s =
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
+ $thread->getTitle()
+ );
$changeslist->insertTimestamp( $s, $rc );
$changeslist->insertUserRelatedLinks( $s, $rc );
@@ -385,40 +387,66 @@
if ( $updater instanceof PostgresUpdater ) {
$updater->addExtensionTable( 'thread',
"$dir/lqt.pg.sql" );
- $updater->addExtensionTable( 'thread_history',
"$dir/schema-changes/thread_history_table.pg.sql" );
- $updater->addExtensionTable(
'thread_pending_relationship',
"$dir/schema-changes/thread_pending_relationship.pg.sql" );
- $updater->addExtensionTable( 'thread_reaction',
"$dir/schema-changes/thread_reactions.pg.sql" );
- $updater->addExtensionField( 'user_message_state',
'ums_conversation',"$dir/schema-changes/ums_conversation.pg.sql" );
+ $updater->addExtensionTable( 'thread_history',
+
"$dir/schema-changes/thread_history_table.pg.sql" );
+ $updater->addExtensionTable(
'thread_pending_relationship',
+
"$dir/schema-changes/thread_pending_relationship.pg.sql" );
+ $updater->addExtensionTable( 'thread_reaction',
+ "$dir/schema-changes/thread_reactions.pg.sql" );
+ $updater->addExtensionField( 'user_message_state',
'ums_conversation',
+ "$dir/schema-changes/ums_conversation.pg.sql" );
} else {
$updater->addExtensionTable( 'thread', "$dir/lqt.sql" );
- $updater->addExtensionTable( 'thread_history',
"$dir/schema-changes/thread_history_table.sql" );
- $updater->addExtensionTable(
'thread_pending_relationship',
"$dir/schema-changes/thread_pending_relationship.sql" );
- $updater->addExtensionTable( 'thread_reaction',
"$dir/schema-changes/thread_reactions.sql" );
- $updater->addExtensionField( 'user_message_state',
'ums_conversation', "$dir/schema-changes/ums_conversation.sql" );
+ $updater->addExtensionTable( 'thread_history',
+ "$dir/schema-changes/thread_history_table.sql"
);
+ $updater->addExtensionTable(
'thread_pending_relationship',
+
"$dir/schema-changes/thread_pending_relationship.sql" );
+ $updater->addExtensionTable( 'thread_reaction',
+ "$dir/schema-changes/thread_reactions.sql" );
+ $updater->addExtensionField( 'user_message_state',
'ums_conversation',
+ "$dir/schema-changes/ums_conversation.sql" );
}
- $updater->addExtensionField( 'thread',
"thread_article_namespace", "$dir/schema-changes/split-thread_article.sql" );
- $updater->addExtensionField( 'thread', "thread_article_title",
"$dir/schema-changes/split-thread_article.sql" );
- $updater->addExtensionField( 'thread', "thread_ancestor",
"$dir/schema-changes/normalise-ancestry.sql" );
- $updater->addExtensionField( 'thread', "thread_parent",
"$dir/schema-changes/normalise-ancestry.sql" );
- $updater->addExtensionField( 'thread', "thread_modified",
"$dir/schema-changes/split-timestamps.sql" );
- $updater->addExtensionField( 'thread', "thread_created",
"$dir/schema-changes/split-timestamps.sql" );
- $updater->addExtensionField( 'thread', "thread_editedness",
"$dir/schema-changes/store-editedness.sql" );
- $updater->addExtensionField( 'thread', "thread_subject",
"$dir/schema-changes/store_subject-author.sql" );
- $updater->addExtensionField( 'thread', "thread_author_id",
"$dir/schema-changes/store_subject-author.sql" );
- $updater->addExtensionField( 'thread', "thread_author_name",
"$dir/schema-changes/store_subject-author.sql" );
- $updater->addExtensionField( 'thread', "thread_sortkey",
"$dir/schema-changes/new-sortkey.sql" );
- $updater->addExtensionField( 'thread', 'thread_replies',
"$dir/schema-changes/store_reply_count.sql" );
- $updater->addExtensionField( 'thread', 'thread_article_id',
"$dir/schema-changes/store_article_id.sql" );
- $updater->addExtensionField( 'thread', 'thread_signature',
"$dir/schema-changes/thread_signature.sql" );
+ $updater->addExtensionField( 'thread',
"thread_article_namespace",
+ "$dir/schema-changes/split-thread_article.sql" );
+ $updater->addExtensionField( 'thread', "thread_article_title",
+ "$dir/schema-changes/split-thread_article.sql" );
+ $updater->addExtensionField( 'thread', "thread_ancestor",
+ "$dir/schema-changes/normalise-ancestry.sql" );
+ $updater->addExtensionField( 'thread', "thread_parent",
+ "$dir/schema-changes/normalise-ancestry.sql" );
+ $updater->addExtensionField( 'thread', "thread_modified",
+ "$dir/schema-changes/split-timestamps.sql" );
+ $updater->addExtensionField( 'thread', "thread_created",
+ "$dir/schema-changes/split-timestamps.sql" );
+ $updater->addExtensionField( 'thread', "thread_editedness",
+ "$dir/schema-changes/store-editedness.sql" );
+ $updater->addExtensionField( 'thread', "thread_subject",
+ "$dir/schema-changes/store_subject-author.sql" );
+ $updater->addExtensionField( 'thread', "thread_author_id",
+ "$dir/schema-changes/store_subject-author.sql" );
+ $updater->addExtensionField( 'thread', "thread_author_name",
+ "$dir/schema-changes/store_subject-author.sql" );
+ $updater->addExtensionField( 'thread', "thread_sortkey",
+ "$dir/schema-changes/new-sortkey.sql" );
+ $updater->addExtensionField( 'thread', 'thread_replies',
+ "$dir/schema-changes/store_reply_count.sql" );
+ $updater->addExtensionField( 'thread', 'thread_article_id',
+ "$dir/schema-changes/store_article_id.sql" );
+ $updater->addExtensionField( 'thread', 'thread_signature',
+ "$dir/schema-changes/thread_signature.sql" );
- $updater->addExtensionIndex( 'thread', 'thread_summary_page',
"$dir/schema-changes/index-summary_page.sql" );
- $updater->addExtensionIndex( 'thread', 'thread_parent',
"$dir/schema-changes/index-thread_parent.sql" );
+ $updater->addExtensionIndex( 'thread', 'thread_summary_page',
+ "$dir/schema-changes/index-summary_page.sql" );
+ $updater->addExtensionIndex( 'thread', 'thread_parent',
+ "$dir/schema-changes/index-thread_parent.sql" );
return true;
}
- static function onTitleMoveComplete( Title $ot, Title $nt, User $user,
$oldid, $newid, $reason = null ) {
+ static function onTitleMoveComplete(
+ Title $ot, Title $nt, User $user, $oldid, $newid, $reason = null
+ ) {
// Check if it's a talk page.
if ( !LqtDispatch::isLqtPage( $ot ) && !LqtDispatch::isLqtPage(
$nt ) ) {
return true;
@@ -485,7 +513,8 @@
$isOnTalkPage = $isOnTalkPage || ( self::$editAppliesTo
&&
self::$editAppliesTo->getTitle()->equals(
$talkPage ) );
- # FIXME: self::$editArticle is sometimes not set; is
that ok and if not why is it happening?
+ # FIXME: self::$editArticle is sometimes not set;
+ # is that ok and if not why is it happening?
if ( self::$editArticle instanceof Article ) {
$isOnTalkPage = $isOnTalkPage ||
(
self::$editArticle->getTitle()->equals( $talkPage ) );
@@ -526,7 +555,8 @@
$insertUrls = array( 'newmessages' => $newMessagesLink
);
- if ( in_array( 'watchlist', array_keys( $personal_urls
) ) ) { // User has viewmywatchlist permission
+ // User has viewmywatchlist permission
+ if ( in_array( 'watchlist', array_keys( $personal_urls
) ) ) {
$personal_urls = wfArrayInsertAfter(
$personal_urls, $insertUrls, 'watchlist' );
} else {
$personal_urls = wfArrayInsertAfter(
$personal_urls, $insertUrls, 'preferences' );
@@ -834,7 +864,9 @@
return $arr;
}
- public static function addPendingRelationship( $thread, $relationship,
$title, $type, &$array ) {
+ public static function addPendingRelationship(
+ $thread, $relationship, $title, $type, &$array
+ ) {
$entry = array(
'thread' => $thread,
'relationship' => $relationship,
@@ -938,7 +970,11 @@
if ( isset( $page['title'] )
&& LqtDispatch::isLqtPage(
Title::newFromText( $page['title'] ) )
) {
- $result->addValue( array( 'query',
'pages' ), $pageid, array( 'islqttalkpage' => '' ) );
+ $result->addValue(
+ array( 'query', 'pages' ),
+ $pageid,
+ array( 'islqttalkpage' => '' )
+ );
}
}
}
diff --git a/classes/Thread.php b/classes/Thread.php
index 15412c8..b1dfc8d 100644
--- a/classes/Thread.php
+++ b/classes/Thread.php
@@ -53,7 +53,8 @@
public static $articleCacheById = array();
public static $reactionCacheById = array();
- public static $VALID_TYPES = array( Threads::TYPE_NORMAL,
Threads::TYPE_MOVED, Threads::TYPE_DELETED );
+ public static $VALID_TYPES = array(
+ Threads::TYPE_NORMAL, Threads::TYPE_MOVED,
Threads::TYPE_DELETED );
public function isHistorical() {
return $this->isHistorical;
@@ -297,7 +298,10 @@
}
if ( $this->replyCount < -1 ) {
- wfWarn( "Saving thread $id with negative reply count
{$this->replyCount} " . wfGetAllCallers() );
+ wfWarn(
+ "Saving thread $id with negative reply count
{$this->replyCount} " .
+ wfGetAllCallers()
+ );
$this->replyCount = -1;
}
@@ -477,7 +481,8 @@
public function incrementReplyCount( $val = 1 ) {
$this->replyCount += $val;
- wfDebug( "Incremented reply count for thread " . $this->id() .
" to " . $this->replyCount . "\n" );
+ wfDebug( "Incremented reply count for thread " . $this->id() .
" to " .
+ $this->replyCount . "\n" );
$thread = $this->superthread();
@@ -912,13 +917,17 @@
$this->article = new Article( $dbTitle, 0 );
$set['thread_article_id'] = $this->articleId;
- wfDebug( "Unfilled or non-existent thread_article_id,
refilling to {$this->articleId}\n" );
+ wfDebug(
+ "Unfilled or non-existent thread_article_id,
refilling to {$this->articleId}\n"
+ );
// There are probably problems on the rest of the
article, trigger a small update
Threads::synchroniseArticleData( $this->article, 100,
'cascade' );
} elseif ( $articleTitle && !$articleTitle->equals( $dbTitle )
) {
// The page was probably moved and this was probably
not updated.
- wfDebug( "Article ID/Title discrepancy, resetting
NS/Title to article provided by ID\n" );
+ wfDebug(
+ "Article ID/Title discrepancy, resetting
NS/Title to article provided by ID\n"
+ );
$this->articleNamespace = $articleTitle->getNamespace();
$this->articleTitle = $articleTitle->getDBkey();
@@ -1250,7 +1259,9 @@
public static function splitIncrementFromSubject( $subject_string ) {
preg_match( '/^(.*) \((\d+)\)$/', $subject_string, $matches );
if ( count( $matches ) != 3 )
- throw new Exception( __METHOD__ . ": thread subject has
no increment: " . $subject_string );
+ throw new Exception(
+ __METHOD__ . ": thread subject has no
increment: " . $subject_string
+ );
else
return $matches;
}
@@ -1325,7 +1336,8 @@
// get false negatives if you use it from some other context.
public function getRestrictions( $action, &$result ) {
if ( $this->hasSuperthread() ) {
- $parent_restrictions =
$this->superthread()->root()->getTitle()->getRestrictions( $action );
+ $parent_restrictions =
$this->superthread()->root()->getTitle()
+ ->getRestrictions( $action );
} else {
$parent_restrictions =
$this->getTitle()->getRestrictions( $action );
}
@@ -1584,7 +1596,8 @@
static $canCreateNew = array();
if ( !isset( $canCreateNew[$userText] ) ) {
- $title = Title::makeTitleSafe( NS_LQT_THREAD, 'Test
title for LQT thread creation check' );
+ $title = Title::makeTitleSafe(
+ NS_LQT_THREAD, 'Test title for LQT thread
creation check' );
$canCreateNew[$userText] = $title->userCan( 'create',
$user, $rigor )
&& $title->userCan( 'edit', $user, $rigor );
}
diff --git a/classes/ThreadHistoryPager.php b/classes/ThreadHistoryPager.php
index 898c178..db74c33 100644
--- a/classes/ThreadHistoryPager.php
+++ b/classes/ThreadHistoryPager.php
@@ -143,7 +143,9 @@
}
$content = wfMsgReplaceArgs( $msg, $args );
- return Html::rawElement( 'span', array( 'class' => 'plainlinks'
), $wgOut->parseInline( $content ) );
+ return Html::rawElement(
+ 'span', array( 'class' => 'plainlinks' ),
$wgOut->parseInline( $content )
+ );
}
public function getIndexField() {
diff --git a/classes/View.php b/classes/View.php
index 4f8f875..a0027d7 100644
--- a/classes/View.php
+++ b/classes/View.php
@@ -382,7 +382,8 @@
function showReplyProtectedNotice( $thread ) {
$log_url = SpecialPage::getTitleFor( 'Log' )->getLocalURL(
"type=protect&user=&page={$thread->title()->getPrefixedURL()}" );
- $link = '<a href="' . $log_url . '">' . wfMessage(
'lqt_protectedfromreply_link' )->escaped() . '</a>';
+ $link = '<a href="' . $log_url . '">' .
+ wfMessage( 'lqt_protectedfromreply_link' )->escaped() .
'</a>';
$this->output->addHTML( '<p>' . wfMessage(
'lqt_protectedfromreply' )
->rawParams( $link )->escaped() );
}
@@ -1356,7 +1357,8 @@
);
if ( $this->user->isAllowed( 'move' ) ) {
- $move_href = SpecialPage::getTitleFor( 'MoveThread',
$thread->title()->getPrefixedText() )->getLocalURL();
+ $move_href = SpecialPage::getTitleFor(
+ 'MoveThread',
$thread->title()->getPrefixedText() )->getLocalURL();
$commands['move'] = array(
'label' => wfMessage( 'lqt-movethread'
)->parse(),
'href' => $move_href,
@@ -1386,7 +1388,11 @@
'label' => wfMessage( 'watch' )->parse(),
'href' => self::permalinkUrlWithQuery(
$thread,
- array( 'action' => 'watch', 'token' =>
WatchAction::getWatchToken( $thread->title(), $this->user, 'watch' ) )
+ array(
+ 'action' => 'watch',
+ 'token' =>
WatchAction::getWatchToken(
+ $thread->title(),
$this->user, 'watch' )
+ )
),
'enabled' => true
);
@@ -1395,7 +1401,11 @@
'label' => wfMessage( 'unwatch' )->parse(),
'href' => self::permalinkUrlWithQuery(
$thread,
- array( 'action' => 'unwatch', 'token'
=> WatchAction::getWatchToken( $thread->title(), $this->user, 'unwatch' ) )
+ array(
+ 'action' => 'unwatch',
+ 'token' =>
WatchAction::getWatchToken(
+ $thread->title(),
$this->user, 'unwatch' )
+ )
),
'enabled' => true
);
@@ -1930,7 +1940,8 @@
foreach ( $replies as $reply ) {
$content = '';
if ( $reply->root() ) {
- $content = ContentHandler::getContentText(
$reply->root()->getPage()->getContent() );
+ $content = ContentHandler::getContentText(
+ $reply->root()->getPage()->getContent()
);
}
if ( trim( $content ) != '' ) {
@@ -2127,7 +2138,9 @@
$class .= ' lqt-thread-no-subthreads';
}
- if ( ! $thread->title()->quickUserCan( 'edit' ) || !
LqtDispatch::isLqtPage( $thread->getTitle() ) ) {
+ if ( !$thread->title()->quickUserCan( 'edit' )
+ || !LqtDispatch::isLqtPage( $thread->getTitle() )
+ ) {
$class .= ' lqt-thread-uneditable';
}
diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index 818634b..c68eabf 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -197,7 +197,10 @@
);
$html .= $sortOrderSelect->getHTML();
- $html .= Xml::submitButton( wfMessage( 'lqt-changesortorder'
)->text(), array( 'class' => 'lqt_go_sort' ) );
+ $html .= Xml::submitButton(
+ wfMessage( 'lqt-changesortorder' )->text(),
+ array( 'class' => 'lqt_go_sort' )
+ );
$html .= Html::hidden( 'title', $this->title->getPrefixedText()
);
@@ -273,8 +276,11 @@
// This closes the div of mw-content-ltr/rtl containing lang
and dir attributes
$this->output->addHTML(
- Html::closeElement( 'div' ) . Html::openElement( 'div',
- array( 'class' => 'lqt-talkpage', 'lang' =>
$wgLang->getCode(), 'dir' => $wgLang->getDir() )
+ Html::closeElement( 'div' ) . Html::openElement( 'div',
array(
+ 'class' => 'lqt-talkpage',
+ 'lang' => $wgLang->getCode(),
+ 'dir' => $wgLang->getDir()
+ )
) );
$html = '';
@@ -301,7 +307,9 @@
}
global $wgSearchTypeAlternatives, $wgSearchType;
- if ( $wgSearchType == "LuceneSearch" || in_array(
"LuceneSearch", $wgSearchTypeAlternatives ?: array() ) ) {
+ if ( $wgSearchType == "LuceneSearch"
+ || in_array( "LuceneSearch", $wgSearchTypeAlternatives
?: array() )
+ ) {
$talkpageHeader .= $this->getSearchBox();
}
$talkpageHeader .= $this->showTalkpageViewOptions( $article );
@@ -573,8 +581,10 @@
$disabledTexts = array();
foreach ( $labels as $type => $label ) {
$msgLabel = wfMessage( $label )->escaped();
- $linkTexts[$type] = "<img
src=\"$path/{$images[$type]}\" alt=\"$msgLabel\"/><br />$msgLabel";
- $disabledTexts[$type] = "<img
src=\"$path/{$disabledImages[$type]}\" alt=\"$msgLabel\"/><br />$msgLabel";
+ $linkTexts[$type] = "<img
src=\"$path/{$images[$type]}\" " .
+ "alt=\"$msgLabel\"/><br />$msgLabel";
+ $disabledTexts[$type] = "<img
src=\"$path/{$disabledImages[$type]}\" " .
+ "alt=\"$msgLabel\"/><br />$msgLabel";
}
$links = $this->getPagingLinks( $linkTexts, $disabledTexts );
diff --git a/pages/ThreadActionPage.php b/pages/ThreadActionPage.php
index 98fbf35..47ccfa8 100644
--- a/pages/ThreadActionPage.php
+++ b/pages/ThreadActionPage.php
@@ -61,7 +61,11 @@
abstract function getSubmitText();
function buildForm() {
- $form = new HTMLForm( $this->getFormFields(),
$this->getContext(), 'lqt-' . $this->getPageName() );
+ $form = new HTMLForm(
+ $this->getFormFields(),
+ $this->getContext(),
+ 'lqt-' . $this->getPageName()
+ );
$par = $this->mThread->title()->getPrefixedText();
--
To view, visit https://gerrit.wikimedia.org/r/356899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia76272aa3d80d2e19b9b9890908da93099aa8701
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
