| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -330,7 +330,6 @@ |
| 331 | 331 | * @return String: Formatted HTML list item |
| 332 | 332 | */ |
| 333 | 333 | public function logLine( $row ) { |
| 334 | | - $row->user_name = $this->fixUserName($row->user_name, $row->log_user); |
| 335 | 334 | $entry = DatabaseLogEntry::newFromRow( $row ); |
| 336 | 335 | $formatter = LogFormatter::newFromEntry( $entry ); |
| 337 | 336 | $formatter->setShowUserToolLinks( !( $this->flags & self::NO_EXTRA_USER_LINKS ) ); |
| — | — | @@ -718,7 +717,7 @@ |
| 719 | 718 | } |
| 720 | 719 | |
| 721 | 720 | /* hook can return false, if we don't want the message to be emitted (Wikia BugId:7093) */ |
| 722 | | - if (!wfRunHooks('LogEventsListShowLogExtract', array(&$s, $types, $page, $user, $param))) { |
| | 721 | + if ( !wfRunHooks( 'LogEventsListShowLogExtract', array( &$s, $types, $page, $user, $param ) ) ) { |
| 723 | 722 | return $pager->getNumRows(); |
| 724 | 723 | } |
| 725 | 724 | |
| — | — | @@ -756,25 +755,8 @@ |
| 757 | 756 | } |
| 758 | 757 | return false; |
| 759 | 758 | } |
| | 759 | + } |
| 760 | 760 | |
| 761 | | - /** |
| 762 | | - * if user_name is empty - use User class to get his name |
| 763 | | - * @param $user_name string |
| 764 | | - * @param $user_id integer |
| 765 | | - * @return string |
| 766 | | - */ |
| 767 | | - public function fixUserName($user_name, $user_id) { |
| 768 | | - if ( empty($user_name) ) { |
| 769 | | - $oUser = User::newFromID($user_id); |
| 770 | | - if ( $oUser instanceof User ) { |
| 771 | | - $user_name = $oUser->getName(); |
| 772 | | - } |
| 773 | | - } |
| 774 | | - |
| 775 | | - return $user_name; |
| 776 | | - } |
| 777 | | -} |
| 778 | | - |
| 779 | 761 | /** |
| 780 | 762 | * @ingroup Pager |
| 781 | 763 | */ |
| — | — | @@ -1035,10 +1017,6 @@ |
| 1036 | 1018 | if( $this->getNumRows() > 0 ) { |
| 1037 | 1019 | $lb = new LinkBatch; |
| 1038 | 1020 | foreach ( $this->mResult as $row ) { |
| 1039 | | - $row->user_name = $this->mLogEventsList->fixUserName($row->user_name, $row->log_user); |
| 1040 | | - if ( empty($row->user_name) ) { |
| 1041 | | - continue; |
| 1042 | | - } |
| 1043 | 1021 | $lb->add( $row->log_namespace, $row->log_title ); |
| 1044 | 1022 | $lb->addObj( Title::makeTitleSafe( NS_USER, $row->user_name ) ); |
| 1045 | 1023 | $lb->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->user_name ) ); |