Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*Actually enforce when you can cascade, add missing [cascade] comment to dummy edit summary

Browse source
This commit is contained in:
Aaron Schulz 2007-04-24 02:20:04 +00:00
parent 1937ee0924
commit c8352e9248
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
includes/Article.php
View file

@ -1677,6 +1677,7 @@ class Article {
# If nothing's changed, do nothing
if( $changed ) {
global $wgGroupPermissions;
if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) {
$dbw = wfGetDB( DB_MASTER );
@ -1684,7 +1685,6 @@ class Article {
$encodedExpiry = Block::encodeExpiry($expiry, $dbw );
$expiry_description = '';
if ( $encodedExpiry != 'infinity' ) {
$expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) ).')';
}
@ -1692,12 +1692,25 @@ class Article {
# Prepare a null revision to be added to the history
$comment = $wgContLang->ucfirst( wfMsgForContent( $protect ? 'protectedarticle' : 'unprotectedarticle', $this->mTitle->getPrefixedText() ) );
foreach( $limit as $action => $restrictions ) {
# Check if the group level required to edit also can protect pages
# Otherwise, people who cannot normally protect can "protect" pages via transclusion
$cascade = ( $cascade && isset($wgGroupPermissions[$restrictions]['protect']) && $wgGroupPermissions[$restrictions]['protect'] );
}
$cascade_description = '';
if ($cascade) {
$cascade_description = ' ['.wfMsg('protect-summary-cascade').']';
}
if( $reason )
$comment .= ": $reason";
if( $protect )
$comment .= " [$updated]";
if ( $expiry_description && $protect )
$comment .= "$expiry_description";
if ( $cascade )
$comment .= "$cascade_description";
$nullRevision = Revision::newNullRevision( $dbw, $id, $comment, true );
$nullRevId = $nullRevision->insertOn( $dbw );
@ -1730,12 +1743,6 @@ class Article {
# Update the protection log
$log = new LogPage( 'protect' );
$cascade_description = '';
if ($cascade) {
$cascade_description = ' ['.wfMsg('protect-summary-cascade').']';
}
if( $protect ) {
$log->addEntry( 'protect', $this->mTitle, trim( $reason . " [$updated]$cascade_description$expiry_description" ) );
} else {