Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revision: Remove some unnecessary temporary variables for returns

Browse source 
Fixed some indenting as well.

Change-Id: I274c0a0d17ea754238db0161106c5abc87dc37b9
This commit is contained in:
Reedy 2020-10-03 20:53:01 +01:00 committed by Krinkle
parent 24a33520fe
commit 66de6726b9
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
includes/Revision/RevisionStore.php
View file

@ -578,14 +578,12 @@ class RevisionStore
$this->insertSlotRowOn( $protoSlot, $dbw, $revisionId, $contentId );
$savedSlot = SlotRecord::newSaved(
return SlotRecord::newSaved(
$revisionId,
$contentId,
$blobAddress,
$protoSlot
);
return $savedSlot;
}
/**
@ -1140,9 +1138,8 @@ class RevisionStore
$db = $this->getDBConnectionRefForQueryFlags( $flags );
$conds[] = 'rev_id=page_latest';
$rev = $this->loadRevisionFromConds( $db, $conds, $flags, $title );
return $rev;
return $this->loadRevisionFromConds( $db, $conds, $flags, $title );
}
}
@ -1181,9 +1178,8 @@ class RevisionStore
$db = $this->getDBConnectionRefForQueryFlags( $flags );
$conds[] = 'rev_id=page_latest';
$rev = $this->loadRevisionFromConds( $db, $conds, $flags );
return $rev;
return $this->loadRevisionFromConds( $db, $conds, $flags );
}
}
@ -1259,9 +1255,7 @@ class RevisionStore
);
}
$slots = $this->constructSlotRecords( $revId, $res, $queryFlags, $title );
return $slots;
return $this->constructSlotRecords( $revId, $res, $queryFlags, $title );
}
/**
@ -2368,9 +2362,7 @@ class RevisionStore
) {
$row = $this->fetchRevisionRowFromConds( $db, $conditions, $flags, $options );
if ( $row ) {
$rev = $this->newRevisionFromRow( $row, $flags, $title );
return $rev;
return $this->newRevisionFromRow( $row, $flags, $title );
}
return null;
@ -2600,18 +2592,18 @@ class RevisionStore
$ret = [
'tables' => [ 'archive' ] + $commentQuery['tables'] + $actorQuery['tables'],
'fields' => [
'ar_id',
'ar_page_id',
'ar_namespace',
'ar_title',
'ar_rev_id',
'ar_timestamp',
'ar_minor_edit',
'ar_deleted',
'ar_len',
'ar_parent_id',
'ar_id',
'ar_page_id',
'ar_namespace',
'ar_title',
'ar_rev_id',
'ar_timestamp',
'ar_minor_edit',
'ar_deleted',
'ar_len',
'ar_parent_id',
'ar_sha1',
] + $commentQuery['fields'] + $actorQuery['fields'],
] + $commentQuery['fields'] + $actorQuery['fields'],
'joins' => $commentQuery['joins'] + $actorQuery['joins'],
];