r79782 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79781‎ | r79782 | r79783 >
Date:00:49, 7 January 2011
Author:tomasz
Status:deferred
Tags:
Comment:
Merge up to head of trunk from r79779
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/CentralNotice (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.php
@@ -74,6 +74,10 @@
7575 $wgExtensionMessagesFiles['CentralNotice'] = $dir . 'CentralNotice.i18n.php';
7676 $wgExtensionAliasesFiles['CentralNotice'] = $dir . 'CentralNotice.alias.php';
7777
 78+// Register user rights
 79+$wgAvailableRights[] = 'centralnotice-admin';
 80+$wgGroupPermissions['sysop']['centralnotice-admin'] = true; // Only sysops can make change
 81+
7882 function efCentralNoticeSetup() {
7983 global $wgHooks, $wgNoticeInfrastructure, $wgAutoloadClasses, $wgSpecialPages;
8084 global $wgCentralNoticeLoader;
@@ -102,10 +106,6 @@
103107 $wgAutoloadClasses['TemplatePager'] = $dir . 'TemplatePager.php';
104108
105109 if ( $wgNoticeInfrastructure ) {
106 - // Register user rights
107 - $wgAvailableRights[] = 'centralnotice-admin';
108 - $wgGroupPermissions['sysop']['centralnotice-admin'] = true; // Only sysops can make change
109 -
110110 $wgSpecialPages['CentralNotice'] = 'CentralNotice';
111111 $wgSpecialPageGroups['CentralNotice'] = 'wiki'; // Wiki data and tools"
112112
Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice
___________________________________________________________________
Modified: svn:mergeinfo
113113 Merged /trunk/extensions/CentralNotice:r79780

Follow-up revisions

RevisionCommit summaryAuthorDate
r80146Merge up to head of trunk from r79782tomasz01:00, 13 January 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r79779Merge up to head of trunk from r77621. Picking up various bug fixestomasz00:27, 7 January 2011

Status & tagging log