From 64ac78b2c2f44c2a0325576df50649493864e928 Mon Sep 17 00:00:00 2001
From: Sean Colombo <sean_colombo@users.mediawiki.org>
Date: Fri, 16 Sep 2011 22:30:39 +0000
Subject: [PATCH] Merged in changes from LogEventsList which prevent missing
 usernames in log-lines and adds hook LogEventsListShowLogExtract. Part of
 merge from here: http://www.mediawiki.org/wiki/Wikia_code

---
 includes/LogEventsList.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index a6da010af9..ffa9f8357e 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -326,6 +326,7 @@ class LogEventsList {
 	 * @return String: Formatted HTML list item
 	 */
 	public function logLine( $row ) {
+		$row->user_name = $this->fixUserName($row->user_name, $row->log_user);
 		$entry = DatabaseLogEntry::newFromRow( $row );
 		$formatter = LogFormatter::newFromEntry( $entry );
 		$formatter->setShowUserToolLinks( !( $this->flags & self::NO_EXTRA_USER_LINKS ) );
@@ -706,6 +707,11 @@ class LogEventsList {
 			$s = str_replace( '$1', $s, $wrap );
 		}
 
+		/* hook can return false, if we don't want the message to be emitted (Wikia BugId:7093) */
+		if (!wfRunHooks('LogEventsListShowLogExtract', array(&$s, $types, $page, $user, $param))) {
+			return $pager->getNumRows();
+		}
+
 		// $out can be either an OutputPage object or a String-by-reference
 		if( $out instanceof OutputPage ){
 			$out->addHTML( $s );
@@ -740,6 +746,23 @@ class LogEventsList {
 		}
 		return false;
 	}
+
+	/**
+	 * if user_name is empty - use User class to get his name
+	 * @param $user_name string
+	 * @param $user_id integer
+	 * @return string
+	 */
+	public function fixUserName($user_name, $user_id) {
+		if ( empty($user_name) ) {
+			$oUser = User::newFromID($user_id);
+			if ( $oUser instanceof User ) {
+				$user_name = $oUser->getName();
+			}
+		}
+
+		return $user_name;
+	}
 }
 
 /**
@@ -1004,6 +1027,10 @@ class LogPager extends ReverseChronologicalPager {
 		if( $this->getNumRows() > 0 ) {
 			$lb = new LinkBatch;
 			foreach ( $this->mResult as $row ) {
+				$row->user_name = $this->mLogEventsList->fixUserName($row->user_name, $row->log_user);
+				if ( empty($row->user_name) ) {
+					continue;
+				}
 				$lb->add( $row->log_namespace, $row->log_title );
 				$lb->addObj( Title::makeTitleSafe( NS_USER, $row->user_name ) );
 				$lb->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->user_name ) );
-- 
2.20.1