Merge "Use CSS columns instead of tables in Special:SpecialPages (2)"

[lhc/web/wiklou.git] / includes / revisiondelete / RevDelArchivedFileItem.php

diff --git a/includes/revisiondelete/RevDelArchivedFileItem.php b/includes/revisiondelete/RevDelArchivedFileItem.php
index dfb55ba..7c41c18 100644 (file)
--- a/includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/includes/revisiondelete/RevDelArchivedFileItem.php
@@ -50,13 +50,21 @@ class RevDelArchivedFileItem extends RevDelFileItem {
 
        public function setBits( $bits ) {
                $dbw = wfGetDB( DB_MASTER );
-               $dbw->update( 'filearchive', array( 'fa_deleted' => $bits ), array( 'fa_id' => $this->row->fa_id, 'fa_deleted' => $this->getBits(), ), __METHOD__ );
+               $dbw->update( 'filearchive',
+                       array( 'fa_deleted' => $bits ),
+                       array(
+                               'fa_id' => $this->row->fa_id,
+                               'fa_deleted' => $this->getBits(),
+                       ),
+                       __METHOD__
+               );
 
-               return (bool) $dbw->affectedRows();
+               return (bool)$dbw->affectedRows();
        }
 
        protected function getLink() {
-               $date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate( $this->file->getTimestamp(), $this->list->getUser() ) );
+               $date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
+                       $this->file->getTimestamp(), $this->list->getUser() ) );
 
                # Hidden files...
                if ( !$this->canViewContent() ) {
@@ -64,7 +72,13 @@ class RevDelArchivedFileItem extends RevDelFileItem {
                } else {
                        $undelete = SpecialPage::getTitleFor( 'Undelete' );
                        $key = $this->file->getKey();
-                       $link = Linker::link( $undelete, $date, array(), array( 'target' => $this->list->title->getPrefixedText(), 'file' => $key, 'token' => $this->list->getUser()->getEditToken( $key ) ) );
+                       $link = Linker::link( $undelete, $date, array(),
+                               array(
+                                       'target' => $this->list->title->getPrefixedText(),
+                                       'file' => $key,
+                                       'token' => $this->list->getUser()->getEditToken( $key )
+                               )
+                       );
                }
                if ( $this->isDeleted() ) {
                        $link = '<span class="history-deleted">' . $link . '</span>';
@@ -76,20 +90,40 @@ class RevDelArchivedFileItem extends RevDelFileItem {
        public function getApiData( ApiResult $result ) {
                $file = $this->file;
                $user = $this->list->getUser();
-               $ret = array( 'title' => $this->list->title->getPrefixedText(), 'timestamp' => wfTimestamp( TS_ISO_8601, $file->getTimestamp() ), 'width' => $file->getWidth(), 'height' => $file->getHeight(), 'size' => $file->getSize(), );
+               $ret = array(
+                       'title' => $this->list->title->getPrefixedText(),
+                       'timestamp' => wfTimestamp( TS_ISO_8601, $file->getTimestamp() ),
+                       'width' => $file->getWidth(),
+                       'height' => $file->getHeight(),
+                       'size' => $file->getSize(),
+               );
                $ret += $file->isDeleted( Revision::DELETED_USER ) ? array( 'userhidden' => '' ) : array();
                $ret += $file->isDeleted( Revision::DELETED_COMMENT ) ? array( 'commenthidden' => '' ) : array();
                $ret += $this->isDeleted() ? array( 'contenthidden' => '' ) : array();
                if ( $this->canViewContent() ) {
-                       $ret += array( 'url' => SpecialPage::getTitleFor( 'Revisiondelete' )->getLinkURL( array( 'target' => $this->list->title->getPrefixedText(), 'file' => $file->getKey(), 'token' => $user->getEditToken( $file->getKey() ) ), false, PROTO_RELATIVE ), );
+                       $ret += array(
+                               'url' => SpecialPage::getTitleFor( 'Revisiondelete' )->getLinkURL(
+                                       array(
+                                               'target' => $this->list->title->getPrefixedText(),
+                                               'file' => $file->getKey(),
+                                               'token' => $user->getEditToken( $file->getKey() )
+                                       ),
+                                       false, PROTO_RELATIVE
+                               ),
+                       );
                }
                if ( $file->userCan( Revision::DELETED_USER, $user ) ) {
-                       $ret += array( 'userid' => $file->getUser( 'id' ), 'user' => $file->getUser( 'text' ), );
+                       $ret += array(
+                               'userid' => $file->getUser( 'id' ),
+                               'user' => $file->getUser( 'text' ),
+                       );
                }
                if ( $file->userCan( Revision::DELETED_COMMENT, $user ) ) {
-                       $ret += array( 'comment' => $file->getRawDescription(), );
+                       $ret += array(
+                               'comment' => $file->getRawDescription(),
+                       );
                }
 
                return $ret;
        }
-}
\ No newline at end of file
+}