Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cache performer of a LogEntry to load it only once from the database

Browse source 
Change-Id: If920ba0a29b8c9b04705a20db5d8f9528b251fe5
This commit is contained in:
umherirrender 2012-10-21 17:57:54 +02:00
parent e8b571fbf1
commit 17652df9f9
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
includes/logging/LogEntry.php
View file

@ -175,6 +175,7 @@ class DatabaseLogEntry extends LogEntryBase {
/// Database result row.
protected $row;
protected $performer;
protected function __construct( $row ) {
$this->row = $row;
@ -232,17 +233,20 @@ class DatabaseLogEntry extends LogEntryBase {
}
public function getPerformer() {
$userId = (int) $this->row->log_user;
if ( $userId !== 0 ) { // logged-in users
if ( isset( $this->row->user_name ) ) {
return User::newFromRow( $this->row );
} else {
return User::newFromId( $userId );
if( !$this->performer ) {
$userId = (int) $this->row->log_user;
if ( $userId !== 0 ) { // logged-in users
if ( isset( $this->row->user_name ) ) {
$this->performer = User::newFromRow( $this->row );
} else {
$this->performer = User::newFromId( $userId );
}
} else { // IP users
$userText = $this->row->log_user_text;
$this->performer = User::newFromName( $userText, false );
}
} else { // IP users
$userText = $this->row->log_user_text;
return User::newFromName( $userText, false );
}
return $this->performer;
}
public function getTarget() {
@ -287,14 +291,17 @@ class RCDatabaseLogEntry extends DatabaseLogEntry {
}
public function getPerformer() {
$userId = (int) $this->row->rc_user;
if ( $userId !== 0 ) {
return User::newFromId( $userId );
} else {
$userText = $this->row->rc_user_text;
// Might be an IP, don't validate the username
return User::newFromName( $userText, false );
if( !$this->performer ) {
$userId = (int) $this->row->rc_user;
if ( $userId !== 0 ) {
$this->performer = User::newFromId( $userId );
} else {
$userText = $this->row->rc_user_text;
// Might be an IP, don't validate the username
$this->performer = User::newFromName( $userText, false );
}
}
return $this->performer;
}
public function getTarget() {