From 4833d8642fbe74f18ecf2f337360f78065a3c9cd Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 15 Sep 2008 18:50:54 +0000 Subject: [PATCH] Revert r40808. No need to make log_params and output uglier due to edit comment limitations. --- includes/LogPage.php | 7 +------ includes/Title.php | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/includes/LogPage.php b/includes/LogPage.php index 312e8002d8..2b821e9f4f 100644 --- a/includes/LogPage.php +++ b/includes/LogPage.php @@ -204,15 +204,10 @@ class LogPage { $params[2] = isset( $params[2] ) ? self::formatBlockFlags( $params[2], is_null( $skin ) ) : ''; } else if ( $type == 'protect' && count($params) == 3 ) { - $details .= "{$params[1]}"; // restrictions and expiries + $details .= " {$params[1]}"; // restrictions and expiries if( $params[2] ) { $details .= ' ['.wfMsg('protect-summary-cascade').']'; } - # If this is going to be displayed, make it somewhat consistent with page history - # and older log entries where everything is treated as a comment - if (!is_null($skin)) { - $details = $skin->commentBlock($details); - } } $rv = wfMsgReal( $wgLogActions[$key], $params, true, !$skin ) . $details; } diff --git a/includes/Title.php b/includes/Title.php index 6599b917bb..79c875c175 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1403,8 +1403,7 @@ class Title { $log = new LogPage( 'protect' ); if( $create_perm ) { - $params = array("[create=$create_perm] $expiry_description",''); - $log->addEntry( $this->mRestrictions['create'] ? 'modify' : 'protect', $this, trim( $reason ), $params ); + $log->addEntry( $this->mRestrictions['create'] ? 'modify' : 'protect', $this, trim( $reason . " [create=$create_perm] $expiry_description" ) ); } else { $log->addEntry( 'unprotect', $this, $reason ); } -- 2.20.1