| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1403,7 +1403,8 @@ |
| 1404 | 1404 | $log = new LogPage( 'protect' ); |
| 1405 | 1405 | |
| 1406 | 1406 | if( $create_perm ) { |
| 1407 | | - $log->addEntry( $this->mRestrictions['create'] ? 'modify' : 'protect', $this, trim( $reason . " [create=$create_perm] $expiry_description" ) ); |
| | 1407 | + $params = array("[create=$create_perm] $expiry_description",''); |
| | 1408 | + $log->addEntry( $this->mRestrictions['create'] ? 'modify' : 'protect', $this, trim( $reason ), $params ); |
| 1408 | 1409 | } else { |
| 1409 | 1410 | $log->addEntry( 'unprotect', $this, $reason ); |
| 1410 | 1411 | } |
| Index: trunk/phase3/includes/LogPage.php |
| — | — | @@ -204,10 +204,15 @@ |
| 205 | 205 | $params[2] = isset( $params[2] ) ? |
| 206 | 206 | self::formatBlockFlags( $params[2], is_null( $skin ) ) : ''; |
| 207 | 207 | } else if ( $type == 'protect' && count($params) == 3 ) { |
| 208 | | - $details .= " {$params[1]}"; // restrictions and expiries |
| | 208 | + $details .= "{$params[1]}"; // restrictions and expiries |
| 209 | 209 | if( $params[2] ) { |
| 210 | 210 | $details .= ' ['.wfMsg('protect-summary-cascade').']'; |
| 211 | 211 | } |
| | 212 | + # If this is going to be displayed, make it somewhat consistent with page history |
| | 213 | + # and older log entries where everything is treated as a comment |
| | 214 | + if (!is_null($skin)) { |
| | 215 | + $details = $skin->commentBlock($details); |
| | 216 | + } |
| 212 | 217 | } |
| 213 | 218 | $rv = wfMsgReal( $wgLogActions[$key], $params, true, !$skin ) . $details; |
| 214 | 219 | } |