| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1158,6 +1158,7 @@ |
| 1159 | 1159 | 'protectlogpage', |
| 1160 | 1160 | 'protectlogtext', |
| 1161 | 1161 | 'protectedarticle', |
| | 1162 | + 'modifiedarticleprotection', |
| 1162 | 1163 | 'unprotectedarticle', |
| 1163 | 1164 | 'protectsub', |
| 1164 | 1165 | 'confirmprotecttext', |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -1699,7 +1699,13 @@ |
| 1700 | 1700 | } |
| 1701 | 1701 | |
| 1702 | 1702 | # Prepare a null revision to be added to the history |
| 1703 | | - $comment = $wgContLang->ucfirst( wfMsgForContent( $protect ? 'protectedarticle' : 'unprotectedarticle', $this->mTitle->getPrefixedText() ) ); |
| | 1703 | + $modified = $current != '' && $protect; |
| | 1704 | + if ( $protect ) { |
| | 1705 | + $comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle'; |
| | 1706 | + } else { |
| | 1707 | + $comment_type = 'unprotectedarticle'; |
| | 1708 | + } |
| | 1709 | + $comment = $wgContLang->ucfirst( wfMsgForContent( $comment_type, $this->mTitle->getPrefixedText() ) ); |
| 1704 | 1710 | |
| 1705 | 1711 | foreach( $limit as $action => $restrictions ) { |
| 1706 | 1712 | # Check if the group level required to edit also can protect pages |
| — | — | @@ -1753,7 +1759,7 @@ |
| 1754 | 1760 | $log = new LogPage( 'protect' ); |
| 1755 | 1761 | |
| 1756 | 1762 | if( $protect ) { |
| 1757 | | - $log->addEntry( 'protect', $this->mTitle, trim( $reason . " [$updated]$cascade_description$expiry_description" ) ); |
| | 1763 | + $log->addEntry( $modified ? 'modify' : 'protect', $this->mTitle, trim( $reason . " [$updated]$cascade_description$expiry_description" ) ); |
| 1758 | 1764 | } else { |
| 1759 | 1765 | $log->addEntry( 'unprotect', $this->mTitle, $reason ); |
| 1760 | 1766 | } |
| Index: trunk/phase3/includes/SpecialLog.php |
| — | — | @@ -384,7 +384,7 @@ |
| 385 | 385 | wfMsg( 'unblocklink' ), |
| 386 | 386 | 'action=unblock&ip=' . urlencode( $s->log_title ) ) . ')'; |
| 387 | 387 | // show change protection link |
| 388 | | - } elseif ( $s->log_action == 'protect' && $wgUser->isAllowed( 'protect' ) ) { |
| | 388 | + } elseif ( ( $s->log_action == 'protect' || $s->log_action == 'modify' ) && $wgUser->isAllowed( 'protect' ) ) { |
| 389 | 389 | $revert = '(' . $skin->makeKnownLink( $title->getPrefixedDBkey() , |
| 390 | 390 | wfMsg( 'protect_change' ), |
| 391 | 391 | 'action=unprotect' ) . ')'; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2219,6 +2219,7 @@ |
| 2220 | 2220 | 'block/block' => 'blocklogentry', |
| 2221 | 2221 | 'block/unblock' => 'unblocklogentry', |
| 2222 | 2222 | 'protect/protect' => 'protectedarticle', |
| | 2223 | + 'protect/modify' => 'modifiedarticleprotection', |
| 2223 | 2224 | 'protect/unprotect' => 'unprotectedarticle', |
| 2224 | 2225 | 'rights/rights' => 'rightslogentry', |
| 2225 | 2226 | 'delete/delete' => 'deletedarticle', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1812,8 +1812,9 @@ |
| 1813 | 1813 | Please hit "back" and reload the page you came from, then try again.', |
| 1814 | 1814 | 'protectlogpage' => 'Protection log', |
| 1815 | 1815 | 'protectlogtext' => 'Below is a list of page locks and unlocks. See the [[Special:Protectedpages|protected pages list]] for the list of currently operational page protections.', |
| 1816 | | -'protectedarticle' => 'protected "[[$1]]"', |
| 1817 | | -'unprotectedarticle' => 'unprotected "[[$1]]"', |
| | 1816 | +'protectedarticle' => 'protected "$1"', |
| | 1817 | +'modifiedarticleprotection' => 'changed protection level for "$1"', |
| | 1818 | +'unprotectedarticle' => 'unprotected "$1"', |
| 1818 | 1819 | 'protectsub' => '(Protecting "$1")', |
| 1819 | 1820 | 'confirmprotecttext' => 'Do you really want to protect this page?', |
| 1820 | 1821 | 'confirmprotect' => 'Confirm protection', |
| Index: trunk/phase3/languages/messages/MessagesRu.php |
| — | — | @@ -1425,8 +1425,9 @@ |
| 1426 | 1426 | Пожалуйста, нажмите кнопку «Назад» и перезагрузите страницу, с которой вы пришли.', |
| 1427 | 1427 | 'protectlogpage' => 'Журнал защиты', |
| 1428 | 1428 | 'protectlogtext' => 'Ниже приведён журнал установок и снятий защиты со статей. Вы можете также просмотреть [[{{ns:special}}:Protectedpages|список страниц, которые в данный момент защищены]].', |
| 1429 | | -'protectedarticle' => 'защищена страница «[[$1]]»', |
| 1430 | | -'unprotectedarticle' => 'снята защита со страницы «[[$1]]»', |
| | 1429 | +'protectedarticle' => 'защищена страница «$1»', |
| | 1430 | +'modifiedarticleprotection' => 'изменён уровень защиты страницы «$1»', |
| | 1431 | +'unprotectedarticle' => 'снята защита со страницы «$1»', |
| 1431 | 1432 | 'protectsub' => '(Установка защиты для «$1»)', |
| 1432 | 1433 | 'confirmprotecttext' => 'Вы действительно хотите установить защиту этой страницы?', |
| 1433 | 1434 | 'confirmprotect' => 'Подтвердите установку защиты страницы', |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -1420,8 +1420,9 @@ |
| 1421 | 1421 | Bitte gehen Sie zurück und versuchen den Vorgang erneut auszuführen.', |
| 1422 | 1422 | 'protectlogpage' => 'Seitenschutz-Logbuch', |
| 1423 | 1423 | 'protectlogtext' => 'Dies ist das Seitenschutz-Logbuch. Siehe die [[{{ns:special}}:Protectedpages|Liste der geschützten Seiten]] für alle aktuell geschützten Seiten.', |
| 1424 | | -'protectedarticle' => 'änderte den Seitenschutzstatus von [[$1]]', |
| 1425 | | -'unprotectedarticle' => 'hob den Schutz von $1 auf', |
| | 1424 | +'protectedarticle' => 'schützte „$1“', |
| | 1425 | +'modifiedarticleprotection' => 'änderte den Schutz von „$1“', |
| | 1426 | +'unprotectedarticle' => 'hob den Schutz von „$1“ auf', |
| 1426 | 1427 | 'protectsub' => '(Schutz ändern von „$1“)', |
| 1427 | 1428 | 'confirmprotecttext' => 'Soll diese Seite wirklich geschützt werden?', |
| 1428 | 1429 | 'confirmprotect' => 'Seitenschutzstatus ändern', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -81,6 +81,7 @@ |
| 82 | 82 | pre-Monobook skins. As always, modifications should go in-wiki to MediaWiki: |
| 83 | 83 | Common.css and MediaWiki:Monobook.css. |
| 84 | 84 | * (bug 8869) Introduce Special:Uncategorizedtemplates |
| | 85 | +* (bug 8734) Different log message when article protection level is changed |
| 85 | 86 | |
| 86 | 87 | == Bugfixes since 1.10 == |
| 87 | 88 | |
| — | — | @@ -153,9 +154,6 @@ |
| 154 | 155 | * (bug 9383) Don't set a default value for BLOB column in rc-deleted |
| 155 | 156 | database patch |
| 156 | 157 | * (bug 10149) Don't show full template list on section-0 edit |
| 157 | | -* Fix maintenance/importImages.php so it doesn't barf PHP errors when no |
| 158 | | - suitable files are found, and make the list of extensions an option (defaults |
| 159 | | - to $wgFileExtensions) |
| 160 | 158 | * (bug 9909) Ensure access to binary fields in the math table use encodeBlob() |
| 161 | 159 | and decodeBlob() |
| 162 | 160 | * (bug 6743) Don't link broken image links to the upload form when uploads |
| — | — | @@ -201,6 +199,9 @@ |
| 202 | 200 | |
| 203 | 201 | * Add support for wgMaxTocLevel option in parserTests |
| 204 | 202 | * (bug 6823) Disable article view counter in maintenance/dumpHTML.php |
| | 203 | +* Fix maintenance/importImages.php so it doesn't barf PHP errors when no |
| | 204 | + suitable files are found, and make the list of extensions an option (defaults |
| | 205 | + to $wgFileExtensions) |
| 205 | 206 | |
| 206 | 207 | == Languages updated since 1.10 == |
| 207 | 208 | |
| — | — | @@ -308,4 +309,4 @@ |
| 309 | 310 | |
| 310 | 311 | === IRC help === |
| 311 | 312 | |
| 312 | | -There's usually someone online in #mediawiki on irc.freenode.net |
| \ No newline at end of file |
| | 313 | +There's usually someone online in #mediawiki on irc.freenode.net |