dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0123950
)
W/S cleanup
author
Mark A. Hershberger
<mah@users.mediawiki.org>
Fri, 4 Mar 2011 19:13:59 +0000
(19:13 +0000)
committer
Mark A. Hershberger
<mah@users.mediawiki.org>
Fri, 4 Mar 2011 19:13:59 +0000
(19:13 +0000)
includes/Import.php
patch
|
blob
|
history
diff --git
a/includes/Import.php
b/includes/Import.php
index
c76a683
..
bc75db1
100644
(file)
--- a/
includes/Import.php
+++ b/
includes/Import.php
@@
-295,7
+295,7
@@
class WikiImporter {
return $buffer;
}
}
return $buffer;
}
}
-
+
$this->reader->close();
return '';
}
$this->reader->close();
return '';
}
@@
-840,15
+840,15
@@
class WikiRevision {
function setSize( $size ) {
$this->size = intval( $size );
}
function setSize( $size ) {
$this->size = intval( $size );
}
-
+
function setType( $type ) {
$this->type = $type;
}
function setType( $type ) {
$this->type = $type;
}
-
+
function setAction( $action ) {
$this->action = $action;
}
function setAction( $action ) {
$this->action = $action;
}
-
+
function setParams( $params ) {
$this->params = $params;
}
function setParams( $params ) {
$this->params = $params;
}
@@
-892,15
+892,15
@@
class WikiRevision {
function getSize() {
return $this->size;
}
function getSize() {
return $this->size;
}
-
+
function getType() {
return $this->type;
}
function getType() {
return $this->type;
}
-
+
function getAction() {
return $this->action;
}
function getAction() {
return $this->action;
}
-
+
function getParams() {
return $this->params;
}
function getParams() {
return $this->params;
}
@@
-959,7
+959,7
@@
class WikiRevision {
) );
$revId = $revision->insertOn( $dbw );
$changed = $article->updateIfNewerOn( $dbw, $revision );
) );
$revId = $revision->insertOn( $dbw );
$changed = $article->updateIfNewerOn( $dbw, $revision );
-
+
# To be on the safe side...
$tempTitle = $GLOBALS['wgTitle'];
$GLOBALS['wgTitle'] = $this->title;
# To be on the safe side...
$tempTitle = $GLOBALS['wgTitle'];
$GLOBALS['wgTitle'] = $this->title;
@@
-987,12
+987,12
@@
class WikiRevision {
return true;
}
return true;
}
-
+
function importLogItem() {
$dbw = wfGetDB( DB_MASTER );
# FIXME: this will not record autoblocks
if( !$this->getTitle() ) {
function importLogItem() {
$dbw = wfGetDB( DB_MASTER );
# FIXME: this will not record autoblocks
if( !$this->getTitle() ) {
- wfDebug( __METHOD__ . ": skipping invalid {$this->type}/{$this->action} log time, timestamp " .
+ wfDebug( __METHOD__ . ": skipping invalid {$this->type}/{$this->action} log time, timestamp " .
$this->timestamp . "\n" );
return;
}
$this->timestamp . "\n" );
return;
}
@@
-1011,7
+1011,7
@@
class WikiRevision {
);
// FIXME: this could fail slightly for multiple matches :P
if( $prior ) {
);
// FIXME: this could fail slightly for multiple matches :P
if( $prior ) {
- wfDebug( __METHOD__ . ": skipping existing item for Log:{$this->type}/{$this->action}, timestamp " .
+ wfDebug( __METHOD__ . ": skipping existing item for Log:{$this->type}/{$this->action}, timestamp " .
$this->timestamp . "\n" );
return false;
}
$this->timestamp . "\n" );
return false;
}