* @return bool|mixed
*/
private function processLogItem( $logInfo ) {
+
$revision = new WikiRevision( $this->config );
- $revision->setID( $logInfo['id'] );
+ if ( isset( $logInfo['id'] ) ) {
+ $revision->setID( $logInfo['id'] );
+ }
$revision->setType( $logInfo['type'] );
$revision->setAction( $logInfo['action'] );
- $revision->setTimestamp( $logInfo['timestamp'] );
- $revision->setParams( $logInfo['params'] );
- $revision->setTitle( Title::newFromText( $logInfo['logtitle'] ) );
+ if ( isset( $logInfo['timestamp'] ) ) {
+ $revision->setTimestamp( $logInfo['timestamp'] );
+ }
+ if ( isset( $logInfo['params'] ) ) {
+ $revision->setParams( $logInfo['params'] );
+ }
+ if ( isset( $logInfo['logtitle'] ) ) {
+ // @todo Using Title for non-local titles is a recipe for disaster.
+ // We should use ForeignTitle here instead.
+ $revision->setTitle( Title::newFromText( $logInfo['logtitle'] ) );
+ }
+
$revision->setNoUpdates( $this->mNoUpdates );
if ( isset( $logInfo['comment'] ) ) {
if ( isset( $logInfo['contributor']['ip'] ) ) {
$revision->setUserIP( $logInfo['contributor']['ip'] );
}
- if ( isset( $logInfo['contributor']['username'] ) ) {
+
+ if ( !isset( $logInfo['contributor']['username'] ) ) {
+ $revision->setUsername( 'Unknown user' );
+ } else {
$revision->setUserName( $logInfo['contributor']['username'] );
}
}
if ( isset( $revisionInfo['contributor']['ip'] ) ) {
$revision->setUserIP( $revisionInfo['contributor']['ip'] );
- }
- if ( isset( $revisionInfo['contributor']['username'] ) ) {
+ } elseif ( isset( $revisionInfo['contributor']['username'] ) ) {
$revision->setUserName( $revisionInfo['contributor']['username'] );
+ } else {
+ $revision->setUserName( 'Unknown user' );
}
$revision->setNoUpdates( $this->mNoUpdates );
$fields = array( 'id', 'ip', 'username' );
$info = array();
+ if ( $this->reader->isEmptyElement ) {
+ return $info;
+ }
while ( $this->reader->read() ) {
if ( $this->reader->nodeType == XMLReader::END_ELEMENT &&
$this->reader->localName == 'contributor' ) {
*/
function getSha1() {
if ( $this->sha1base36 ) {
- return wfBaseConvert( $this->sha1base36, 36, 16 );
+ return Wikimedia\base_convert( $this->sha1base36, 36, 16 );
}
return false;
}
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 " .
'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(),