From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: Update to MediaWiki 1.20.2 this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024 --- includes/revisiondelete/RevisionDeleter.php | 84 +++++++---------------------- 1 file changed, 18 insertions(+), 66 deletions(-) (limited to 'includes/revisiondelete/RevisionDeleter.php') diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php index 59a9fa82..c59edc2a 100644 --- a/includes/revisiondelete/RevisionDeleter.php +++ b/includes/revisiondelete/RevisionDeleter.php @@ -2,12 +2,29 @@ /** * Revision/log/file deletion backend * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * * @file + * @ingroup RevisionDelete */ /** * Temporary b/c interface, collection of static functions. * @ingroup SpecialPage + * @ingroup RevisionDelete */ class RevisionDeleter { /** @@ -42,7 +59,7 @@ class RevisionDeleter { * * @param $n Integer: the new bitfield. * @param $o Integer: the old bitfield. - * @return An array as described above. + * @return array An array as described above. * @since 1.19 public */ public static function getChanges( $n, $o ) { @@ -107,69 +124,4 @@ class RevisionDeleter { return $timestamp; } - - /** - * Creates utility links for log entries. - * - * @param $title Title - * @param $paramArray Array - * @param $messages - * @return String - */ - public static function getLogLinks( $title, $paramArray, $messages ) { - global $wgLang; - - if ( count( $paramArray ) >= 2 ) { - // Different revision types use different URL params... - $key = $paramArray[0]; - // $paramArray[1] is a CSV of the IDs - $Ids = explode( ',', $paramArray[1] ); - - $revert = array(); - - // Diff link for single rev deletions - if ( count( $Ids ) == 1 ) { - // Live revision diffs... - if ( in_array( $key, array( 'oldid', 'revision' ) ) ) { - $revert[] = Linker::linkKnown( - $title, - $messages['diff'], - array(), - array( - 'diff' => intval( $Ids[0] ), - 'unhide' => 1 - ) - ); - // Deleted revision diffs... - } elseif ( in_array( $key, array( 'artimestamp','archive' ) ) ) { - $revert[] = Linker::linkKnown( - SpecialPage::getTitleFor( 'Undelete' ), - $messages['diff'], - array(), - array( - 'target' => $title->getPrefixedDBKey(), - 'diff' => 'prev', - 'timestamp' => $Ids[0] - ) - ); - } - } - - // View/modify link... - $revert[] = Linker::linkKnown( - SpecialPage::getTitleFor( 'Revisiondelete' ), - $messages['revdel-restore'], - array(), - array( - 'target' => $title->getPrefixedText(), - 'type' => $key, - 'ids' => implode(',', $Ids), - ) - ); - - // Pipe links - return wfMsg( 'parentheses', $wgLang->pipeList( $revert ) ); - } - return ''; - } } -- cgit v1.2.2