http://www.mediawiki.org/wiki/Special:Code/MediaWiki/91023
Revision: 91023
Author: nad
Date: 2011-06-28 22:03:18 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
oops more defaulread stuff to remove
Modified Paths:
--------------
trunk/extensions/SimpleSecurity/SimpleSecurity.php
trunk/extensions/SimpleSecurity/SimpleSecurity_body.php
Modified: trunk/extensions/SimpleSecurity/SimpleSecurity.php
===================================================================
--- trunk/extensions/SimpleSecurity/SimpleSecurity.php 2011-06-28 22:00:21 UTC
(rev 91022)
+++ trunk/extensions/SimpleSecurity/SimpleSecurity.php 2011-06-28 22:03:18 UTC
(rev 91023)
@@ -22,7 +22,7 @@
* @copyright © 2007-2011 Aran Dunkley
* @license GNU General Public Licence 2.0 or later
*/
-define( 'SIMPLESECURITY_VERSION', '5.0.3, 2011-06-28' );
+define( 'SIMPLESECURITY_VERSION', '5.0.4, 2011-06-29' );
# Load the SimpleSecurity class and messages
$dir = dirname( __FILE__ ) . '/';
Modified: trunk/extensions/SimpleSecurity/SimpleSecurity_body.php
===================================================================
--- trunk/extensions/SimpleSecurity/SimpleSecurity_body.php 2011-06-28
22:00:21 UTC (rev 91022)
+++ trunk/extensions/SimpleSecurity/SimpleSecurity_body.php 2011-06-28
22:03:18 UTC (rev 91023)
@@ -167,12 +167,10 @@
*/
public function onImgAuthBeforeStream( &$title, &$path, &$name,
&$result ) {
global $wgUser;
-
if ( !$this->userCanReadTitle( $wgUser, $title, $error )) {
$result = array('img-auth-accessdenied',
'img-auth-noread', $name);
return false;
}
-
return true;
}
@@ -201,13 +199,6 @@
$groups = $user->getEffectiveGroups();
- # Put the anon read right back in $wgGroupPermissions if it was
there initially
- # - it had to be removed because Title::userCanRead
short-circuits with it
- if ( $this->default_read ) {
- $wgGroupPermissions['*']['read'] = true;
- $rights[] = 'read';
- }
-
# Filter rights according to $wgPageRestrictions
# - also update LS (rules from local settings) items to info
array
$this->pageRestrictions( $rights, $groups, $title, true );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
