Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 12 insertions, 2 deletions

diff --git a/extensions/Renameuser/Renameuser.hooks.php b/extensions/Renameuser/Renameuser.hooks.php
index 41dcc43e..e5271735 100644
--- a/extensions/Renameuser/Renameuser.hooks.php
+++ b/extensions/Renameuser/Renameuser.hooks.php
@@ -9,14 +9,14 @@ class RenameuserHooks {
 	 * @return bool
 	 */
 	public static function onShowMissingArticle( $article ) {
-		global $wgOut;
 		$title = $article->getTitle();
 		$oldUser = User::newFromName( $title->getBaseText() );
 		if ( ($title->getNamespace() == NS_USER || $title->getNamespace() == NS_USER_TALK ) && ($oldUser && $oldUser->isAnon() )) {
 			// Get the title for the base userpage
 			$page = Title::makeTitle( NS_USER, str_replace( ' ', '_', $title->getBaseText() ) )->getPrefixedDBkey();
+			$out = $article->getContext()->getOutput();
 			LogEventsList::showLogExtract(
-				$wgOut,
+				$out,
 				'renameuser',
 				$page,
 				'',
@@ -53,4 +53,14 @@ class RenameuserHooks {
 		}
 		return true;
 	}
+
+	/**
+	 * So users can just type in a username for target and it'll work
+	 * @param array $types
+	 * @return bool
+	 */
+	public static function onGetLogTypesOnUser( array &$types ) {
+		$types[] = 'renameuser';
+		return true;
+	}
 }