From 130264cbe63b5f6b81a664b7e4144f5a830ba1e7 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 21 Sep 2011 07:41:45 +0000
Subject: [PATCH] Per Nikerabbit, follow-up r97658: change getAuthor() into
 getPerformer() for consistency

---
 includes/LogEventsList.php       | 20 ++++++++++----------
 includes/specials/SpecialLog.php |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index fabfe8339f..4d25c6e114 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -779,7 +779,7 @@ class LogEventsList {
  * @ingroup Pager
  */
 class LogPager extends ReverseChronologicalPager {
-	private $types = array(), $author = '', $title = '', $pattern = '';
+	private $types = array(), $performer = '', $title = '', $pattern = '';
 	private $typeCGI = '';
 	public $mLogEventsList;
 
@@ -788,7 +788,7 @@ class LogPager extends ReverseChronologicalPager {
 	 *
 	 * @param $list LogEventsList
 	 * @param $types String or Array: log types to show
-	 * @param $author String: the user who made the log entries
+	 * @param $performer String: the user who made the log entries
 	 * @param $title String: the page title the log entries are for
 	 * @param $pattern String: do a prefix search rather than an exact title match
 	 * @param $conds Array: extra conditions for the query
@@ -796,7 +796,7 @@ class LogPager extends ReverseChronologicalPager {
 	 * @param $month Integer: the month to start from
 	 * @param $tagFilter String: tag
 	 */
-	public function __construct( $list, $types = array(), $author = '', $title = '', $pattern = '',
+	public function __construct( $list, $types = array(), $performer = '', $title = '', $pattern = '',
 		$conds = array(), $year = false, $month = false, $tagFilter = '' ) {
 		parent::__construct( $list->getContext() );
 		$this->mConds = $conds;
@@ -804,7 +804,7 @@ class LogPager extends ReverseChronologicalPager {
 		$this->mLogEventsList = $list;
 
 		$this->limitType( $types ); // also excludes hidden types
-		$this->limitAuthor( $author );
+		$this->limitPerformer( $performer );
 		$this->limitTitle( $title, $pattern );
 		$this->getDateCond( $year, $month );
 		$this->mTagFilter = $tagFilter;
@@ -813,7 +813,7 @@ class LogPager extends ReverseChronologicalPager {
 	public function getDefaultQuery() {
 		$query = parent::getDefaultQuery();
 		$query['type'] = $this->typeCGI; // arrays won't work here
-		$query['user'] = $this->author;
+		$query['user'] = $this->performer;
 		$query['month'] = $this->mMonth;
 		$query['year'] = $this->mYear;
 		return $query;
@@ -877,7 +877,7 @@ class LogPager extends ReverseChronologicalPager {
 	 *
 	 * @param $name String: (In)valid user name
 	 */
-	private function limitAuthor( $name ) {
+	private function limitPerformer( $name ) {
 		if( $name == '' ) {
 			return false;
 		}
@@ -901,7 +901,7 @@ class LogPager extends ReverseChronologicalPager {
 				$this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_USER) .
 					' != ' . LogPage::SUPPRESSED_USER;
 			}
-			$this->author = $usertitle->getText();
+			$this->performer = $usertitle->getText();
 		}
 	}
 
@@ -985,7 +985,7 @@ class LogPager extends ReverseChronologicalPager {
 		# Avoid usage of the wrong index by limiting
 		# the choices of available indexes. This mainly
 		# avoids site-breaking filesorts.
-		} elseif( $this->title || $this->pattern || $this->author ) {
+		} elseif( $this->title || $this->pattern || $this->performer ) {
 			$index['logging'] = array( 'page_time', 'user_time' );
 			if( count($this->types) == 1 ) {
 				$index['logging'][] = 'log_user_type_time';
@@ -1056,8 +1056,8 @@ class LogPager extends ReverseChronologicalPager {
 	/**
 	 * @return string
 	 */
-	public function getAuthor() {
-		return $this->author;
+	public function getPerformer() {
+		return $this->performer;
 	}
 
 	/**
diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php
index ba5678296c..1c4f1d792f 100644
--- a/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@ -106,12 +106,12 @@ class SpecialLog extends SpecialPage {
 		$this->addHeader( $opts->getValue( 'type' ) );
 
 		# Set relevant user
-		if ( $pager->getAuthor() ) {
-			$this->getSkin()->setRelevantUser( User::newFromName( $pager->getAuthor() ) );
+		if ( $pager->getPerformer() ) {
+			$this->getSkin()->setRelevantUser( User::newFromName( $pager->getPerformer() ) );
 		}
 
 		# Show form options
-		$loglist->showOptions( $pager->getType(), $pager->getAuthor(), $pager->getPage(), $pager->getPattern(),
+		$loglist->showOptions( $pager->getType(), $pager->getPerformer(), $pager->getPage(), $pager->getPattern(),
 			$pager->getYear(), $pager->getMonth(), $pager->getFilterParams(), $opts->getValue( 'tagfilter' ) );
 
 		# Insert list
-- 
2.20.1