Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 8 insertions, 3 deletions

diff --git a/includes/specials/SpecialUnblock.php b/includes/specials/SpecialUnblock.php
index 244b8894..f81f1c30 100644
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -53,7 +53,7 @@ class SpecialUnblock extends SpecialPage {
 
 		$out = $this->getOutput();
 		$out->setPageTitle( $this->msg( 'unblockip' ) );
-		$out->addModules( 'mediawiki.special' );
+		$out->addModules( array( 'mediawiki.special', 'mediawiki.userSuggest' ) );
 
 		$form = new HTMLForm( $this->getFields(), $this->getContext() );
 		$form->setWrapperLegendMsg( 'unblockip' );
@@ -88,6 +88,7 @@ class SpecialUnblock extends SpecialPage {
 				'autofocus' => true,
 				'size' => '45',
 				'required' => true,
+				'cssclass' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
 			),
 			'Name' => array(
 				'type' => 'info',
@@ -226,8 +227,12 @@ class SpecialUnblock extends SpecialPage {
 		}
 
 		# Make log entry
-		$log = new LogPage( 'block' );
-		$log->addEntry( 'unblock', $page, $data['Reason'], array(), $performer );
+		$logEntry = new ManualLogEntry( 'block', 'unblock' );
+		$logEntry->setTarget( $page );
+		$logEntry->setComment( $data['Reason'] );
+		$logEntry->setPerformer( $performer );
+		$logId = $logEntry->insert();
+		$logEntry->publish( $logId );
 
 		return true;
 	}