From 5c06f5f51743d3cde185d3c81b1d771e08863b14 Mon Sep 17 00:00:00 2001 From: nullzero Date: Tue, 31 Dec 2013 01:42:35 -0500 Subject: [PATCH] LogEntry: Make newFromRow work with RC object LogEntry::newFromRow is supposed to give a RCDatabaseLogEntry if the given row is a RC log entry. The previous code only did this if an array was passed as the $row argument. This adds a type cast and fixes the function so that the proper LogEntry subclass is returned no matter what variable type is passed to the function. Bug: 52053 Change-Id: I6f64358837b37c54d00a7544e9e8a92c216bbe89 --- includes/logging/LogEntry.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php index 76c2280cd0..71b4fc24d7 100644 --- a/includes/logging/LogEntry.php +++ b/includes/logging/LogEntry.php @@ -161,8 +161,9 @@ class DatabaseLogEntry extends LogEntryBase { * @return DatabaseLogEntry */ public static function newFromRow( $row ) { - if ( is_array( $row ) && isset( $row['rc_logid'] ) ) { - return new RCDatabaseLogEntry( (object)$row ); + $row = (object)$row; + if ( isset( $row->rc_logid ) ) { + return new RCDatabaseLogEntry( $row ); } else { return new self( $row ); } -- 2.20.1