1 files changed, 38 insertions, 5 deletions

diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 4aa6a826..37560d80 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -7,6 +7,21 @@
  * - formatting log entries based on database fields
  * - user is now part of the action message
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @author Niklas Laxström
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
@@ -97,6 +112,7 @@ abstract class LogEntryBase implements LogEntry {
 	/**
 	 * Whether the parameters for this log are stored in new or
 	 * old format.
+	 * @return bool
 	 */
 	public function isLegacy() {
 		return false;
@@ -344,7 +360,7 @@ class ManualLogEntry extends LogEntryBase {
 	 * 
 	 * @since 1.19
 	 * 
-	 * @param $parameters Associative array
+	 * @param $parameters array Associative array
 	 */
 	public function setParameters( $parameters ) {
 		$this->parameters = $parameters;
@@ -431,7 +447,7 @@ class ManualLogEntry extends LogEntryBase {
 			'log_user_text' => $this->getPerformer()->getName(),
 			'log_namespace' => $this->getTarget()->getNamespace(),
 			'log_title' => $this->getTarget()->getDBkey(),
-			'log_page' => $this->getTarget()->getArticleId(),
+			'log_page' => $this->getTarget()->getArticleID(),
 			'log_comment' => $comment,
 			'log_params' => serialize( (array) $this->getParameters() ),
 		);
@@ -457,18 +473,29 @@ class ManualLogEntry extends LogEntryBase {
 
 		$logpage = SpecialPage::getTitleFor( 'Log', $this->getType() );
 		$user = $this->getPerformer();
+		$ip = "";
+		if ( $user->isAnon() ) {
+			/*
+			 * "MediaWiki default" and friends may have
+			 * no IP address in their name
+			 */
+			if ( IP::isIPAddress( $user->getName() ) ) {
+				$ip = $user->getName();
+			}
+		}
 		$rc = RecentChange::newLogEntry(
 			$this->getTimestamp(),
 			$logpage,
 			$user,
-			$formatter->getIRCActionText(), // Used for IRC feeds
-			$user->isAnon() ? $user->getName() : '',
+			$formatter->getPlainActionText(),
+			$ip,
 			$this->getType(),
 			$this->getSubtype(),
 			$this->getTarget(),
 			$this->getComment(),
 			serialize( (array) $this->getParameters() ),
-			$newId
+			$newId,
+			$formatter->getIRCActionComment() // Used for IRC feeds
 		);
 
 		if ( $to === 'rc' || $to === 'rcandudp' ) {
@@ -494,10 +521,16 @@ class ManualLogEntry extends LogEntryBase {
 		return $this->parameters;
 	}
 
+	/**
+	 * @return User
+	 */
 	public function getPerformer() {
 		return $this->performer;
 	}
 
+	/**
+	 * @return Title
+	 */
 	public function getTarget() {
 		return $this->target;
 	}