http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89515
Revision: 89515
Author: reedy
Date: 2011-06-05 18:29:43 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
* (bug 21107) Split error "customcssjsprotected" into separate messages for JS
and CSS
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/Title.php
trunk/phase3/includes/api/ApiBase.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/language/messages.inc
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2011-06-05 18:05:45 UTC (rev 89514)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-06-05 18:29:43 UTC (rev 89515)
@@ -22,6 +22,7 @@
and the functionality has been moved to the relevant extensions. See
http://www.mediawiki.org/wiki/Extension:DublinCoreRdf and
http://www.mediawiki.org/wiki/Extension:CreativeCoreRdf as appropriate
+* (bug 21107) Split error "customcssjsprotected" into separate messages for JS
and CSS
=== New features in 1.19 ===
* (bug 28916) A way to to toggle mw.config legacy globals settings from
Modified: trunk/phase3/includes/Title.php
===================================================================
--- trunk/phase3/includes/Title.php 2011-06-05 18:05:45 UTC (rev 89514)
+++ trunk/phase3/includes/Title.php 2011-06-05 18:29:43 UTC (rev 89515)
@@ -1376,9 +1376,9 @@
if ( $action != 'patrol' && !$user->isAllowed( 'editusercssjs' )
&& !preg_match( '/^' . preg_quote(
$user->getName(), '/' ) . '\//', $this->mTextform ) ) {
if ( $this->isCssSubpage() && !$user->isAllowed(
'editusercss' ) ) {
- $errors[] = array( 'customcssjsprotected' );
+ $errors[] = array( 'customcssprotected' );
} else if ( $this->isJsSubpage() && !$user->isAllowed(
'edituserjs' ) ) {
- $errors[] = array( 'customcssjsprotected' );
+ $errors[] = array( 'customjsprotected' );
}
}
Modified: trunk/phase3/includes/api/ApiBase.php
===================================================================
--- trunk/phase3/includes/api/ApiBase.php 2011-06-05 18:05:45 UTC (rev
89514)
+++ trunk/phase3/includes/api/ApiBase.php 2011-06-05 18:29:43 UTC (rev
89515)
@@ -970,7 +970,8 @@
'ns-specialprotected' => array( 'code' =>
'unsupportednamespace', 'info' => "Pages in the Special namespace can't be
edited" ),
'protectedinterface' => array( 'code' =>
'protectednamespace-interface', 'info' => "You're not allowed to edit interface
messages" ),
'namespaceprotected' => array( 'code' => 'protectednamespace',
'info' => "You're not allowed to edit pages in the ``\$1'' namespace" ),
- 'customcssjsprotected' => array( 'code' =>
'customcssjsprotected', 'info' => "You're not allowed to edit custom CSS and
JavaScript pages" ),
+ 'customcssprotected' => array( 'code' => 'customcssprotected',
'info' => "You're not allowed to edit custom CSS pages" ),
+ 'customjsprotected' => array( 'code' => 'customjsprotected',
'info' => "You're not allowed to edit custom JavaScript pages" ),
'cascadeprotected' => array( 'code' => 'cascadeprotected',
'info' => "The page you're trying to edit is protected because it's included in
a cascade-protected page" ),
'protectedpagetext' => array( 'code' => 'protectedpage', 'info'
=> "The ``\$1'' right is required to edit this page" ),
'protect-cantedit' => array( 'code' => 'cantedit', 'info' =>
"You can't protect this page because you can't edit it" ),
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2011-06-05 18:05:45 UTC
(rev 89514)
+++ trunk/phase3/languages/messages/MessagesEn.php 2011-06-05 18:29:43 UTC
(rev 89515)
@@ -1028,7 +1028,8 @@
'cascadeprotected' => 'This page has been protected from editing, because
it is included in the following {{PLURAL:$1|page, which is|pages, which are}}
protected with the "cascading" option turned on:
$2',
'namespaceprotected' => "You do not have permission to edit pages in the
'''$1''' namespace.",
-'customcssjsprotected' => "You do not have permission to edit this page,
because it contains another user's personal settings.",
+'customcssprotected' => "You do not have permission to edit this JavaScript
page, because it contains another user's personal settings.",
+'customjsprotected' => "You do not have permission to edit this CSS page,
because it contains another user's personal settings.",
'ns-specialprotected' => 'Special pages cannot be edited.',
'titleprotected' => 'This title has been protected from creation by
[[User:$1|$1]].
The reason given is "\'\'$2\'\'".',
Modified: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc 2011-06-05 18:05:45 UTC
(rev 89514)
+++ trunk/phase3/maintenance/language/messages.inc 2011-06-05 18:29:43 UTC
(rev 89515)
@@ -405,7 +405,8 @@
'sqlhidden',
'cascadeprotected',
'namespaceprotected',
- 'customcssjsprotected',
+ 'customcssprotected',
+ 'customjsprotected',
'ns-specialprotected',
'titleprotected',
),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
