Finally removing the deprecated and unused functions User::isSysop, User::isBureaucra...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index beb1e99..52b3918 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -116,6 +116,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6753) Fixed broken Kazakh linktrail (kk)
 * (bug 6700) Added Kazakh language variants to Names.php
 * (bug 6827) some i18n specific maintenance scripts fails after merge of localisation-work branch
+* Throwed an exception for the deprecated functions OutputPage::sysopRequired and
+  OutputPage::developerRequired - use OutputPage::permissionRequired instead.
+* Removed the deprecated functions User::isSysop, User::isBureaucrat and User::isDeveloper -
+  use User::isAllowed instead.
 
 == Languages updated ==
 

diff --git a/includes/User.php b/includes/User.php
index 7a77cd3..f4cbbc8 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1306,30 +1306,6 @@ class User {
                return !$this->isLoggedIn();
        }
 
-       /**
-        * Deprecated in 1.6, die in 1.7, to be removed in 1.8
-        * @deprecated
-        */
-       function isSysop() {
-               throw new MWException( "Call to deprecated (v1.7) User::isSysop() method\n" );
-       }
-
-       /**
-        * Deprecated in 1.6, die in 1.7, to be removed in 1.8
-        * @deprecated
-        */
-       function isDeveloper() {
-               throw new MWException( "Call to deprecated (v1.7) User::isDeveloper() method\n" );
-       }
-
-       /**
-        * Deprecated in 1.6, die in 1.7, to be removed in 1.8
-        * @deprecated
-        */
-       function isBureaucrat() {
-               throw new MWException( "Call to deprecated (v1.7) User::isBureaucrat() method\n" );
-       }
-
        /**
         * Whether the user is a bot
         * @deprecated