diff options
Diffstat (limited to 'includes/revisiondelete')
| -rw-r--r-- | includes/revisiondelete/RevisionDelete.php | 13 | ||||
| -rw-r--r-- | includes/revisiondelete/RevisionDeleteAbstracts.php | 7 | ||||
| -rw-r--r-- | includes/revisiondelete/RevisionDeleter.php | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php index 6ceadff4..1ace3836 100644 --- a/includes/revisiondelete/RevisionDelete.php +++ b/includes/revisiondelete/RevisionDelete.php @@ -398,7 +398,6 @@ class RevDel_ArchiveItem extends RevDel_RevisionItem { } } - /** * Item class for a archive table row by ar_rev_id -- actually * used via RevDel_RevisionList. @@ -424,7 +423,7 @@ class RevDel_ArchivedRevisionItem extends RevDel_ArchiveItem { $dbw->update( 'archive', array( 'ar_deleted' => $bits ), array( 'ar_rev_id' => $this->row->ar_rev_id, - 'ar_deleted' => $this->getBits() + 'ar_deleted' => $this->getBits() ), __METHOD__ ); return (bool)$dbw->affectedRows(); @@ -454,7 +453,9 @@ class RevDel_FileList extends RevDel_List { foreach( $this->ids as $timestamp ) { $archiveNames[] = $timestamp . '!' . $this->title->getDBkey(); } - return $db->select( 'oldimage', '*', + return $db->select( + 'oldimage', + OldLocalFile::selectFields(), array( 'oi_name' => $this->title->getDBkey(), 'oi_archive_name' => $archiveNames @@ -695,7 +696,9 @@ class RevDel_ArchivedFileList extends RevDel_FileList { */ public function doQuery( $db ) { $ids = array_map( 'intval', $this->ids ); - return $db->select( 'filearchive', '*', + return $db->select( + 'filearchive', + ArchivedFile::selectFields(), array( 'fa_name' => $this->title->getDBkey(), 'fa_id' => $ids @@ -899,7 +902,7 @@ class RevDel_LogItem extends RevDel_Item { $action = $formatter->getActionText(); // Comment $comment = $this->list->getLanguage()->getDirMark() . Linker::commentBlock( $this->row->log_comment ); - if( LogEventsList::isDeleted($this->row,LogPage::DELETED_COMMENT) ) { + if( LogEventsList::isDeleted( $this->row, LogPage::DELETED_COMMENT ) ) { $comment = '<span class="history-deleted">' . $comment . '</span>'; } diff --git a/includes/revisiondelete/RevisionDeleteAbstracts.php b/includes/revisiondelete/RevisionDeleteAbstracts.php index 4f58099f..b2108de6 100644 --- a/includes/revisiondelete/RevisionDeleteAbstracts.php +++ b/includes/revisiondelete/RevisionDeleteAbstracts.php @@ -47,7 +47,7 @@ abstract class RevDel_List extends RevisionListBase { * Set the visibility for the revisions in this list. Logging and * transactions are done here. * - * @param $params array Associative array of parameters. Members are: + * @param array $params Associative array of parameters. Members are: * value: The integer value to set the visibility to * comment: The log comment. * @return Status @@ -176,7 +176,7 @@ abstract class RevDel_List extends RevisionListBase { /** * Record a log entry on the action - * @param $params array Associative array of parameters: + * @param array $params Associative array of parameters: * newBits: The new value of the *_deleted bitfield * oldBits: The old value of the *_deleted bitfield. * title: The target title @@ -184,6 +184,7 @@ abstract class RevDel_List extends RevisionListBase { * comment: The log comment * authorsIds: The array of the user IDs of the offenders * authorsIPs: The array of the IP/anon user offenders + * @throws MWException */ protected function updateLog( $params ) { // Get the URL param's corresponding DB field @@ -219,7 +220,7 @@ abstract class RevDel_List extends RevisionListBase { /** * Get log parameter array. - * @param $params array Associative array of log parameters, same as updateLog() + * @param array $params Associative array of log parameters, same as updateLog() * @return array */ public function getLogParams( $params ) { diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php index c59edc2a..fe351c51 100644 --- a/includes/revisiondelete/RevisionDeleter.php +++ b/includes/revisiondelete/RevisionDeleter.php @@ -31,12 +31,12 @@ class RevisionDeleter { * Checks for a change in the bitfield for a certain option and updates the * provided array accordingly. * - * @param $desc String: description to add to the array if the option was + * @param string $desc description to add to the array if the option was * enabled / disabled. * @param $field Integer: the bitmask describing the single option. * @param $diff Integer: the xor of the old and new bitfields. * @param $new Integer: the new bitfield - * @param $arr Array: the array to update. + * @param array $arr the array to update. */ protected static function checkItem( $desc, $field, $diff, $new, &$arr ) { if( $diff & $field ) { |