Remove ?>'s from files. They're pointless, and just asking for people to mess with...

[lhc/web/wiklou.git] / includes / Title.php

diff --git a/includes/Title.php b/includes/Title.php
index 8a21ab3..eae188c 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1148,7 +1148,7 @@ class Title {
                        return $result;
                }
 
-               if( $wgUser->isAllowed('read') ) {
+               if( $wgUser->isAllowed( 'read' ) ) {
                        return true;
                } else {
                        global $wgWhitelistRead;
@@ -1160,19 +1160,35 @@ class Title {
                        if( $this->isSpecial( 'Userlogin' ) || $this->isSpecial( 'Resetpass' ) ) {
                                return true;
                        }
-
-                       /** some pages are explicitly allowed */
+                       
+                       /**
+                        * Check for explicit whitelisting
+                        */
                        $name = $this->getPrefixedText();
-                       if( $wgWhitelistRead && in_array( $name, $wgWhitelistRead ) ) {
+                       if( $wgWhitelistRead && in_array( $name, $wgWhitelistRead, true ) )
                                return true;
-                       }
-
-                       # Compatibility with old settings
+                       
+                       /**
+                        * Old settings might have the title prefixed with
+                        * a colon for main-namespace pages
+                        */
                        if( $wgWhitelistRead && $this->getNamespace() == NS_MAIN ) {
-                               if( in_array( ':' . $name, $wgWhitelistRead ) ) {
+                               if( in_array( ':' . $name, $wgWhitelistRead ) )
                                        return true;
-                               }
                        }
+                       
+                       /**
+                        * If it's a special page, ditch the subpage bit
+                        * and check again
+                        */
+                       if( $this->getNamespace() == NS_SPECIAL ) {
+                               $name = $this->getText();
+                               list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $name );
+                               $pure = SpecialPage::getTitleFor( $name )->getPrefixedText();
+                               if( in_array( $pure, $wgWhitelistRead, true ) )
+                                       return true;
+                       }
+
                }
                return false;
        }
@@ -2561,4 +2577,4 @@ class Title {
        
 }
 
-?>
+