X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=blobdiff_plain;f=includes%2Fimport%2FWikiRevision.php;h=8705bb01c8def6aa208e3b84fb182a6dba60e49a;hb=ab0a02f640c9f815231835e1b2b6edfcf82215eb;hp=90b048a6bd50912eed5701798f74edc2c3db4e9e;hpb=851eaeeddad02dc88b2645a394af38be73e48f0d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 90b048a6bd..8705bb01c8 100644
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -500,7 +500,7 @@ class WikiRevision {
 		$prevId = $dbw->selectField( 'revision', 'rev_id',
 			array(
 				'rev_page' => $pageId,
-				'rev_timestamp <= ' . $dbw->timestamp( $this->timestamp ),
+				'rev_timestamp <= ' . $dbw->addQuotes( $dbw->timestamp( $this->timestamp ) ),
 			),
 			__METHOD__,
 			array( 'ORDER BY' => array(
@@ -544,6 +544,16 @@ class WikiRevision {
 
 	function importLogItem() {
 		$dbw = wfGetDB( DB_MASTER );
+
+		$user = User::newFromName( $this->getUser() );
+		if ( $user ) {
+			$userId = intval( $user->getId() );
+			$userText = $user->getName();
+		} else {
+			$userId = 0;
+			$userText = $this->getUser();
+		}
+
 		# @todo FIXME: This will not record autoblocks
 		if ( !$this->getTitle() ) {
 			wfDebug( __METHOD__ . ": skipping invalid {$this->type}/{$this->action} log time, timestamp " .
@@ -576,8 +586,8 @@ class WikiRevision {
 			'log_type' => $this->type,
 			'log_action' => $this->action,
 			'log_timestamp' => $dbw->timestamp( $this->timestamp ),
-			'log_user' => User::idFromName( $this->user_text ),
-			# 'log_user_text' => $this->user_text,
+			'log_user' => $userId,
+			'log_user_text' => $userText,
 			'log_namespace' => $this->getTitle()->getNamespace(),
 			'log_title' => $this->getTitle()->getDBkey(),
 			'log_comment' => $this->getComment(),