devunt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119002
Change subject: Make only allowed user can use debug toolbar
......................................................................
Make only allowed user can use debug toolbar
When $wgDebugToolbar is true, all users can access to debug toolbar now.
But maybe someone want to show debug toolbar to specific users, not to
all users. So can hide internal infomation to normal users.
You can add 'usedebugtoolbar' permission to a group for debug toolbar
Bug: 62718
Change-Id: I3bd2186cb8dbbdee5bf8a7372c73d6bb8ff842cb
---
M includes/DefaultSettings.php
M includes/Setup.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesKo.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
6 files changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/02/119002/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 50db6c7..02c436b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4326,6 +4326,7 @@
$wgGroupPermissions['sysop']['movefile'] = true;
$wgGroupPermissions['sysop']['unblockself'] = true;
$wgGroupPermissions['sysop']['suppressredirect'] = true;
+$wgGroupPermissions['sysop']['usedebugtoolbar'] = true;
#$wgGroupPermissions['sysop']['upload_by_url'] = true;
#$wgGroupPermissions['sysop']['mergehistory'] = true;
diff --git a/includes/Setup.php b/includes/Setup.php
index 777ca37..1677a0b 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -398,15 +398,6 @@
wfProfileOut( $fname . '-defaults' );
-// Disable MWDebug for command line mode, this prevents MWDebug from eating up
-// all the memory from logging SQL queries on maintenance scripts
-global $wgCommandLineMode;
-if ( $wgDebugToolbar && !$wgCommandLineMode ) {
- wfProfileIn( $fname . '-debugtoolbar' );
- MWDebug::init();
- wfProfileOut( $fname . '-debugtoolbar' );
-}
-
if ( !class_exists( 'AutoLoader' ) ) {
require_once "$IP/includes/AutoLoader.php";
}
@@ -574,6 +565,16 @@
$wgDeferredUpdateList = array();
wfProfileOut( $fname . '-globals' );
+
+// Disable MWDebug for command line mode, this prevents MWDebug from eating up
+// all the memory from logging SQL queries on maintenance scripts
+global $wgCommandLineMode;
+if ( $wgDebugToolbar && !$wgCommandLineMode &&
$wgUser->isAllowed('usedebugtoolbar')) {
+ wfProfileIn( $fname . '-debugtoolbar' );
+ MWDebug::init();
+ wfProfileOut( $fname . '-debugtoolbar' );
+}
+
wfProfileIn( $fname . '-extensions' );
# Extension setup functions for extensions other than skins
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index df17d8f..4945bc6 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2139,6 +2139,7 @@
'right-override-export-depth' => 'Export pages including linked pages up to a
depth of 5',
'right-sendemail' => 'Send email to other users',
'right-passwordreset' => 'View password reset emails',
+'right-usedebugtoolbar' => 'Can use debug toolbar',
# Special:Log/newusers
'newuserlogpage' => 'User creation log',
diff --git a/languages/messages/MessagesKo.php
b/languages/messages/MessagesKo.php
index a56aab0..ac010c6 100644
--- a/languages/messages/MessagesKo.php
+++ b/languages/messages/MessagesKo.php
@@ -1746,6 +1746,7 @@
'right-override-export-depth' => '5단계로 링크된 문서를 포함하여 문서를 내보내기',
'right-sendemail' => '다른 사용자에게 이메일 보내기',
'right-passwordreset' => '비밀번호 재설정 이메일을 보기',
+'right-usedebugtoolbar' => '디버그 툴바 사용 가능',
# Special:Log/newusers
'newuserlogpage' => '사용자 등록 기록',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index 7a8495a..908f21b 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -3587,6 +3587,7 @@
'right-override-export-depth' => '{{doc-right|override-export-depth}}',
'right-sendemail' => '{{doc-right|sendemail}}',
'right-passwordreset' => '{{doc-right|passwordreset}}',
+'right-usedebugtoolbar' => '{{doc-right|usedebugtoolbar}}',
# Special:Log/newusers
'newuserlogpage' => '{{doc-logpage}}
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index d4fdfee..225fd42 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1258,6 +1258,7 @@
'right-override-export-depth',
'right-sendemail',
'right-passwordreset',
+ 'right-usedebugtoolbar'
),
'newuserlog' => array(
'newuserlogpage',
--
To view, visit https://gerrit.wikimedia.org/r/119002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bd2186cb8dbbdee5bf8a7372c73d6bb8ff842cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: devunt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
