Merge "Fix logic in NamespaceInfo::getRestrictionLevels"

diff --combined tests/phpunit/includes/title/NamespaceInfoTest.php
index 4e376e8,5275dcf..b1262a3
--- 1/tests/phpunit/includes/title/NamespaceInfoTest.php
--- 2/tests/phpunit/includes/title/NamespaceInfoTest.php
+++ b/tests/phpunit/includes/title/NamespaceInfoTest.php
@@@ -601,7 -601,6 +601,7 @@@ class NamespaceInfoTest extends MediaWi
         * getSubject/Talk/Associated
         * %{
         */
 +
        /**
         * @dataProvider provideSubjectTalk
         * @covers NamespaceInfo::getSubject
@@@ -881,7 -880,6 +881,7 @@@
  
        // No canonical namespace names
        // %{
 +
        /**
         * @covers NamespaceInfo::getCanonicalNamespaces
         */
@@@ -984,7 -982,6 +984,7 @@@
  
        // Hook namespaces
        // %{
 +
        /**
         * @return array Expected canonical namespaces
         */
@@@ -1050,7 -1047,6 +1050,7 @@@
  
        // Extra namespaces
        // %{
 +
        /**
         * @return NamespaceInfo
         */
@@@ -1106,7 -1102,6 +1106,7 @@@
  
        // Canonical namespace caching
        // %{
 +
        /**
         * @covers NamespaceInfo::getCanonicalNamespaces
         */
@@@ -1300,11 -1295,7 +1300,7 @@@
                        'No namespace restriction' => [ [ '', 'autoconfirmed', 'sysop' ], NS_TALK ],
                        'Restricted to autoconfirmed' => [ [ '', 'sysop' ], NS_MAIN ],
                        'Restricted to sysop' => [ [ '' ], NS_USER ],
-                       // @todo Bug -- 'sysop' protection should be allowed in this case. Someone who's
-                       // autoconfirmed and also privileged can edit this namespace, and would be blocked by
-                       // the sysop protection.
-                       'Restricted to someone in two groups' => [ [ '' ], 101 ],
- 
+                       'Restricted to someone in two groups' => [ [ '', 'sysop' ], 101 ],
                        'No special permissions' => [ [ '' ], NS_TALK, $this->getMockUser() ],
                        'autoconfirmed' => [
                                [ '', 'autoconfirmed' ],