| Index: trunk/extensions/SimpleSecurity/SimpleSecurity_body.php |
| — | — | @@ -167,12 +167,10 @@ |
| 168 | 168 | */ |
| 169 | 169 | public function onImgAuthBeforeStream( &$title, &$path, &$name, &$result ) { |
| 170 | 170 | global $wgUser; |
| 171 | | - |
| 172 | 171 | if ( !$this->userCanReadTitle( $wgUser, $title, $error )) { |
| 173 | 172 | $result = array('img-auth-accessdenied', 'img-auth-noread', $name); |
| 174 | 173 | return false; |
| 175 | 174 | } |
| 176 | | - |
| 177 | 175 | return true; |
| 178 | 176 | } |
| 179 | 177 | |
| — | — | @@ -201,13 +199,6 @@ |
| 202 | 200 | |
| 203 | 201 | $groups = $user->getEffectiveGroups(); |
| 204 | 202 | |
| 205 | | - # Put the anon read right back in $wgGroupPermissions if it was there initially |
| 206 | | - # - it had to be removed because Title::userCanRead short-circuits with it |
| 207 | | - if ( $this->default_read ) { |
| 208 | | - $wgGroupPermissions['*']['read'] = true; |
| 209 | | - $rights[] = 'read'; |
| 210 | | - } |
| 211 | | - |
| 212 | 203 | # Filter rights according to $wgPageRestrictions |
| 213 | 204 | # - also update LS (rules from local settings) items to info array |
| 214 | 205 | $this->pageRestrictions( $rights, $groups, $title, true ); |
| Index: trunk/extensions/SimpleSecurity/SimpleSecurity.php |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | * @copyright © 2007-2011 Aran Dunkley |
| 24 | 24 | * @license GNU General Public Licence 2.0 or later |
| 25 | 25 | */ |
| 26 | | -define( 'SIMPLESECURITY_VERSION', '5.0.3, 2011-06-28' ); |
| | 26 | +define( 'SIMPLESECURITY_VERSION', '5.0.4, 2011-06-29' ); |
| 27 | 27 | |
| 28 | 28 | # Load the SimpleSecurity class and messages |
| 29 | 29 | $dir = dirname( __FILE__ ) . '/'; |