| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -779,7 +779,7 @@ |
| 780 | 780 | * @ingroup Pager |
| 781 | 781 | */ |
| 782 | 782 | class LogPager extends ReverseChronologicalPager { |
| 783 | | - private $types = array(), $author = '', $title = '', $pattern = ''; |
| | 783 | + private $types = array(), $performer = '', $title = '', $pattern = ''; |
| 784 | 784 | private $typeCGI = ''; |
| 785 | 785 | public $mLogEventsList; |
| 786 | 786 | |
| — | — | @@ -788,7 +788,7 @@ |
| 789 | 789 | * |
| 790 | 790 | * @param $list LogEventsList |
| 791 | 791 | * @param $types String or Array: log types to show |
| 792 | | - * @param $author String: the user who made the log entries |
| | 792 | + * @param $performer String: the user who made the log entries |
| 793 | 793 | * @param $title String: the page title the log entries are for |
| 794 | 794 | * @param $pattern String: do a prefix search rather than an exact title match |
| 795 | 795 | * @param $conds Array: extra conditions for the query |
| — | — | @@ -796,7 +796,7 @@ |
| 797 | 797 | * @param $month Integer: the month to start from |
| 798 | 798 | * @param $tagFilter String: tag |
| 799 | 799 | */ |
| 800 | | - public function __construct( $list, $types = array(), $author = '', $title = '', $pattern = '', |
| | 800 | + public function __construct( $list, $types = array(), $performer = '', $title = '', $pattern = '', |
| 801 | 801 | $conds = array(), $year = false, $month = false, $tagFilter = '' ) { |
| 802 | 802 | parent::__construct( $list->getContext() ); |
| 803 | 803 | $this->mConds = $conds; |
| — | — | @@ -804,7 +804,7 @@ |
| 805 | 805 | $this->mLogEventsList = $list; |
| 806 | 806 | |
| 807 | 807 | $this->limitType( $types ); // also excludes hidden types |
| 808 | | - $this->limitAuthor( $author ); |
| | 808 | + $this->limitPerformer( $performer ); |
| 809 | 809 | $this->limitTitle( $title, $pattern ); |
| 810 | 810 | $this->getDateCond( $year, $month ); |
| 811 | 811 | $this->mTagFilter = $tagFilter; |
| — | — | @@ -813,7 +813,7 @@ |
| 814 | 814 | public function getDefaultQuery() { |
| 815 | 815 | $query = parent::getDefaultQuery(); |
| 816 | 816 | $query['type'] = $this->typeCGI; // arrays won't work here |
| 817 | | - $query['user'] = $this->author; |
| | 817 | + $query['user'] = $this->performer; |
| 818 | 818 | $query['month'] = $this->mMonth; |
| 819 | 819 | $query['year'] = $this->mYear; |
| 820 | 820 | return $query; |
| — | — | @@ -877,7 +877,7 @@ |
| 878 | 878 | * |
| 879 | 879 | * @param $name String: (In)valid user name |
| 880 | 880 | */ |
| 881 | | - private function limitAuthor( $name ) { |
| | 881 | + private function limitPerformer( $name ) { |
| 882 | 882 | if( $name == '' ) { |
| 883 | 883 | return false; |
| 884 | 884 | } |
| — | — | @@ -901,7 +901,7 @@ |
| 902 | 902 | $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_USER) . |
| 903 | 903 | ' != ' . LogPage::SUPPRESSED_USER; |
| 904 | 904 | } |
| 905 | | - $this->author = $usertitle->getText(); |
| | 905 | + $this->performer = $usertitle->getText(); |
| 906 | 906 | } |
| 907 | 907 | } |
| 908 | 908 | |
| — | — | @@ -985,7 +985,7 @@ |
| 986 | 986 | # Avoid usage of the wrong index by limiting |
| 987 | 987 | # the choices of available indexes. This mainly |
| 988 | 988 | # avoids site-breaking filesorts. |
| 989 | | - } elseif( $this->title || $this->pattern || $this->author ) { |
| | 989 | + } elseif( $this->title || $this->pattern || $this->performer ) { |
| 990 | 990 | $index['logging'] = array( 'page_time', 'user_time' ); |
| 991 | 991 | if( count($this->types) == 1 ) { |
| 992 | 992 | $index['logging'][] = 'log_user_type_time'; |
| — | — | @@ -1056,8 +1056,8 @@ |
| 1057 | 1057 | /** |
| 1058 | 1058 | * @return string |
| 1059 | 1059 | */ |
| 1060 | | - public function getAuthor() { |
| 1061 | | - return $this->author; |
| | 1060 | + public function getPerformer() { |
| | 1061 | + return $this->performer; |
| 1062 | 1062 | } |
| 1063 | 1063 | |
| 1064 | 1064 | /** |
| Index: trunk/phase3/includes/specials/SpecialLog.php |
| — | — | @@ -106,12 +106,12 @@ |
| 107 | 107 | $this->addHeader( $opts->getValue( 'type' ) ); |
| 108 | 108 | |
| 109 | 109 | # Set relevant user |
| 110 | | - if ( $pager->getAuthor() ) { |
| 111 | | - $this->getSkin()->setRelevantUser( User::newFromName( $pager->getAuthor() ) ); |
| | 110 | + if ( $pager->getPerformer() ) { |
| | 111 | + $this->getSkin()->setRelevantUser( User::newFromName( $pager->getPerformer() ) ); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | # Show form options |
| 115 | | - $loglist->showOptions( $pager->getType(), $pager->getAuthor(), $pager->getPage(), $pager->getPattern(), |
| | 115 | + $loglist->showOptions( $pager->getType(), $pager->getPerformer(), $pager->getPage(), $pager->getPattern(), |
| 116 | 116 | $pager->getYear(), $pager->getMonth(), $pager->getFilterParams(), $opts->getValue( 'tagfilter' ) ); |
| 117 | 117 | |
| 118 | 118 | # Insert list |