Wikinaut has uploaded a new change for review. https://gerrit.wikimedia.org/r/70671
Change subject: code cosmetics: changing from Xml to Html class in most cases
......................................................................
code cosmetics: changing from Xml to Html class in most cases
Change-Id: I982b39f13db667f32db6abbbc550ddd395cada6d
---
M UserMerge_body.php
1 file changed, 124 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge
refs/changes/71/70671/1
diff --git a/UserMerge_body.php b/UserMerge_body.php
index 969aa67..5583ccb 100644
--- a/UserMerge_body.php
+++ b/UserMerge_body.php
@@ -116,44 +116,128 @@
}
}
- $out->addHTML(
- Xml::openElement( 'form', array( 'method' => 'post',
'action' => $this->getTitle()->getLocalUrl(), 'id' => 'usermergeform' ) ) .
- Xml::fieldset( $this->msg( 'usermerge-fieldset'
)->text() ) .
- Xml::openElement( 'table', array( 'id' =>
'mw-usermerge-table' ) ) .
- "<tr>
- <td class='mw-label'>" .
- Xml::label( $this->msg(
'usermerge-olduser' )->text(), 'olduser' ) .
- "</td>
- <td class='mw-input'>" .
- Xml::input( 'olduser', 20,
$olduser_text, array( 'type' => 'text', 'tabindex' => '1', 'onFocus' =>
"document.getElementById( 'olduser' ).select;" ) ) . ' ' .
- "</td>
- </tr>
- <tr>
- <td class='mw-label'>" .
- Xml::label( $this->msg(
'usermerge-newuser' )->text(), 'newuser' ) .
- "</td>
- <td class='mw-input'>" .
- Xml::input( 'newuser', 20,
$newuser_text, array( 'type' => 'text', 'tabindex' => '2', 'onFocus' =>
"document.getElementById( 'newuser' ).select;" ) ) .
- "</td>
- </tr>
- <tr>
- <td> " .
- "</td>
- <td class='mw-input'>" .
- Xml::checkLabel( $this->msg(
'usermerge-deleteolduser' )->text(), 'deleteuser', 'deleteuser',
$deleteUserCheck, array( 'tabindex' => '3' ) ) .
- "</td>
- </tr>
- <tr>
- <td> 
- </td>
- <td class='mw-submit'>" .
- Xml::submitButton( $this->msg(
'usermerge-submit' )->text(), array( 'tabindex' => '4' ) ) .
- "</td>
- </tr>" .
- Xml::closeElement( 'table' ) .
- Xml::closeElement( 'fieldset' ) .
- Html::Hidden( 'token', $user->getEditToken() ) .
- Xml::closeElement( 'form' ) . "\n"
+ $out->addHtml(
+
+ Html::rawElement( 'form',
+
+ array(
+ 'method' => 'post',
+ 'action' =>
$this->getTitle()->getLocalUrl(),
+ 'id' => 'usermergeform'
+ ),
+
+ Html::rawElement( 'fieldset',
+
+ array(),
+ Html::element( 'legend',
+ array(),
+ $this->msg(
'usermerge-fieldset' )->text()
+ ) .
+
+ Html::rawElement( 'table',
+
+ array( 'id' =>
'mw-usermerge-table' ),
+ Html::rawElement( 'tr',
+
+ array(),
+ Html::rawElement( 'td',
+ array( 'class'
=> 'mw-label' ),
+ Html::element(
'label',
+ array(
'for' => 'olduser' ),
+
$this->msg( 'usermerge-olduser' )->text()
+ )
+ ) .
+
+ Html::rawElement( 'td',
+ array( 'class'
=> 'mw-input' ),
+ Html::input(
+
'olduser',
+
$olduser_text,
+ 'text',
+ array(
+
'tabindex' => '1',
+
'size' => '20',
+
'onFocus' => "document.getElementById( 'olduser' ).select;"
+ )
+ ),
+ ' '
+ )
+ ) .
+
+ Html::rawElement( 'tr',
+
+ array(),
+ Html::rawElement( 'td',
+ array( 'class'
=> 'mw-label' ),
+ Html::element(
'label',
+ array(
'for' => 'newuser' ),
+
$this->msg( 'usermerge-newuser' )->text()
+ )
+ ) .
+
+ Html::rawElement( 'td',
+ array( 'class'
=> 'mw-input' ),
+ Html::input(
+
'newuser',
+
$newuser_text,
+ 'text',
+ array(
+
'tabindex' => '2',
+
'size' => '20',
+
'onFocus' => "document.getElementById( 'newuser' ).select;"
+ )
+ )
+ )
+
+ ) .
+
+ Html::rawElement( 'tr',
+
+ array(),
+ Html::rawElement( 'td',
+ array(),
+ " "
+ ) .
+
+ Html::rawElement( 'td',
+ array( 'class'
=> 'mw-input' ),
+ Xml::checkLabel(
+
$this->msg( 'usermerge-deleteolduser' )->text(),
+
'deleteuser',
+
'deleteuser',
+
$deleteUserCheck,
+ array(
'tabindex' => '3' )
+ )
+ )
+
+ ) .
+
+ Html::rawElement( 'tr',
+
+ array(),
+ Html::rawElement( 'td',
+ array(),
+ " "
+ ) .
+
+ Html::rawElement( 'td',
+ array( 'class'
=> 'mw-submit' ),
+
Xml::submitButton(
+
$this->msg( 'usermerge-submit' )->text(),
+ array(
'tabindex' => '4' )
+ )
+ )
+
+ )
+
+ )
+
+ ) .
+
+ Html::Hidden( 'token', $user->getEditToken() )
+
+ ) . "\n"
+
);
if ( $validNewUser && $validOldUser ) {
@@ -326,7 +410,7 @@
private function mergeEditcount( $newuserID, $olduserID ) {
$dbw = wfGetDB( DB_MASTER );
- $olduserEdits = $dbw->selectField(
+ $olduserEdits = $dbw->selectField(
'user',
'user_editcount',
array( 'user_id' => $olduserID ),
@@ -336,7 +420,7 @@
$olduserEdits = 0;
}
- $newuserEdits = $dbw->selectField(
+ $newuserEdits = $dbw->selectField(
'user',
'user_editcount',
array( 'user_id' => $newuserID ),
--
To view, visit https://gerrit.wikimedia.org/r/70671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I982b39f13db667f32db6abbbc550ddd395cada6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
