Reverting r107496, r107497
[lhc/web/wiklou.git] / includes / revisiondelete / RevisionDeleter.php
index 6e38c6e..59a9fa8 100644 (file)
@@ -28,18 +28,24 @@ class RevisionDeleter {
        }
 
        /**
-        * Gets an array of message keys describing the changes made to the visibility
-        * of the revision. If the resulting array is $arr, then $arr[0] will contain an
-        * array of strings describing the items that were hidden, $arr[2] will contain
-        * an array of strings describing the items that were unhidden, and $arr[3] will
-        * contain an array with a single string, which can be one of "applied
-        * restrictions to sysops", "removed restrictions from sysops", or null.
+        * Gets an array of message keys describing the changes made to the
+        * visibility of the revision.
+        *
+        * If the resulting array is $arr, then $arr[0] will contain an array of
+        * keys describing the items that were hidden, $arr[1] will contain
+        * an array of keys describing the items that were unhidden, and $arr[2]
+        * will contain an array with a single message key, which can be one of
+        * "revdelete-restricted", "revdelete-unrestricted" indicating (un)suppression
+        * or null to indicate nothing in particular.
+        * You can turn the keys in $arr[0] and $arr[1] into message keys by
+        * appending -hid and and -unhid to the keys respectively.
         *
         * @param $n Integer: the new bitfield.
         * @param $o Integer: the old bitfield.
         * @return An array as described above.
+        * @since 1.19 public
         */
-       protected static function getChanges( $n, $o ) {
+       public static function getChanges( $n, $o ) {
                $diff = $n ^ $o;
                $ret = array( 0 => array(), 1 => array(), 2 => array() );
                // Build bitfield changes in language
@@ -59,60 +65,11 @@ class RevisionDeleter {
                return $ret;
        }
 
-       /**
-        * Gets a log message to describe the given revision visibility change. This
-        * message will be of the form "[hid {content, edit summary, username}];
-        * [unhid {...}][applied restrictions to sysops] for $count revisions: $comment".
-        *
-        * @param $count Integer: The number of effected revisions.
-        * @param $nbitfield Integer: The new bitfield for the revision.
-        * @param $obitfield Integer: The old bitfield for the revision.
-        * @param $isForLog Boolean
-        * @param $forContent Boolean
+       /** Get DB field name for URL param...
+        * Future code for other things may also track
+        * other types of revision-specific changes.
+        * @return string One of log_id/rev_id/fa_id/ar_timestamp/oi_archive_name
         */
-       public static function getLogMessage( $count, $nbitfield, $obitfield, $isForLog = false, $forContent = false ) {
-               global $wgLang, $wgContLang;
-
-               $lang = $forContent ? $wgContLang : $wgLang;
-               $msgFunc = $forContent ? "wfMsgForContent" : "wfMsg";
-
-               $changes = self::getChanges( $nbitfield, $obitfield );
-               array_walk( $changes, array( __CLASS__, 'expandMessageArray' ), $forContent );
-
-               $changesText = array();
-
-               if( count( $changes[0] ) ) {
-                       $changesText[] = $msgFunc( 'revdelete-hid', $lang->commaList( $changes[0] ) );
-               }
-               if( count( $changes[1] ) ) {
-                       $changesText[] = $msgFunc( 'revdelete-unhid', $lang->commaList( $changes[1] ) );
-               }
-
-               $s = $lang->semicolonList( $changesText );
-               if( count( $changes[2] ) ) {
-                       $s .= $s ? ' (' . $changes[2][0] . ')' : ' ' . $changes[2][0];
-               }
-
-               $msg = $isForLog ? 'logdelete-log-message' : 'revdelete-log-message';
-               return wfMsgExt( $msg, $forContent ? array( 'parsemag', 'content' ) : array( 'parsemag' ), $s, $lang->formatNum($count) );
-       }
-
-       private static function expandMessageArray(& $msg, $key, $forContent) {
-               if ( is_array ( $msg ) ) {
-                       array_walk( $msg, array( __CLASS__, 'expandMessageArray' ), $forContent );
-               } else {
-                       if ( $forContent ) {
-                               $msg = wfMsgForContent($msg);
-                       } else {
-                               $msg = wfMsg($msg);
-                       }
-               }
-       }
-
-       // Get DB field name for URL param...
-       // Future code for other things may also track
-       // other types of revision-specific changes.
-       // @returns string One of log_id/rev_id/fa_id/ar_timestamp/oi_archive_name
        public static function getRelationType( $typeName ) {
                if ( isset( SpecialRevisionDelete::$deprecatedTypeMap[$typeName] ) ) {
                        $typeName = SpecialRevisionDelete::$deprecatedTypeMap[$typeName];
@@ -156,16 +113,15 @@ class RevisionDeleter {
         *
         * @param $title Title
         * @param $paramArray Array
-        * @param $skin Skin
         * @param $messages
         * @return String
         */
-       public static function getLogLinks( $title, $paramArray, $skin, $messages ) {
+       public static function getLogLinks( $title, $paramArray, $messages ) {
                global $wgLang;
 
                if ( count( $paramArray ) >= 2 ) {
                        // Different revision types use different URL params...
-                       $originalKey = $key = $paramArray[0];
+                       $key = $paramArray[0];
                        // $paramArray[1] is a CSV of the IDs
                        $Ids = explode( ',', $paramArray[1] );
 
@@ -175,19 +131,18 @@ class RevisionDeleter {
                        if ( count( $Ids ) == 1 ) {
                                // Live revision diffs...
                                if ( in_array( $key, array( 'oldid', 'revision' ) ) ) {
-                                       $revert[] = $skin->link(
+                                       $revert[] = Linker::linkKnown(
                                                $title,
                                                $messages['diff'],
                                                array(),
                                                array(
                                                        'diff' => intval( $Ids[0] ),
                                                        'unhide' => 1
-                                               ),
-                                               array( 'known', 'noclasses' )
+                                               )
                                        );
                                // Deleted revision diffs...
                                } elseif ( in_array( $key, array( 'artimestamp','archive' ) ) ) {
-                                       $revert[] = $skin->link(
+                                       $revert[] = Linker::linkKnown(
                                                SpecialPage::getTitleFor( 'Undelete' ),
                                                $messages['diff'],
                                                array(),
@@ -195,14 +150,13 @@ class RevisionDeleter {
                                                        'target'    => $title->getPrefixedDBKey(),
                                                        'diff'      => 'prev',
                                                        'timestamp' => $Ids[0]
-                                               ),
-                                               array( 'known', 'noclasses' )
+                                               )
                                        );
                                }
                        }
 
                        // View/modify link...
-                       $revert[] = $skin->link(
+                       $revert[] = Linker::linkKnown(
                                SpecialPage::getTitleFor( 'Revisiondelete' ),
                                $messages['revdel-restore'],
                                array(),
@@ -210,8 +164,7 @@ class RevisionDeleter {
                                        'target' => $title->getPrefixedText(),
                                        'type' => $key,
                                        'ids' => implode(',', $Ids),
-                               ),
-                               array( 'known', 'noclasses' )
+                               )
                        );
 
                        // Pipe links