Merge "Remove functions deprecated since 1.19 from EditPage.php"

diff --combined RELEASE-NOTES-1.24
index 9357feb,7c86a91..f59df05
--- 1/RELEASE-NOTES-1.24
--- 2/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@@ -125,6 -125,8 +125,6 @@@ production
  * Upgrade jQuery Cookie to v1.3.1.
  * (bug 20476) Add a "viewsuppressed" user right to be able to view
    suppressed content but not suppress it ("suppressrevision" right).
 -* Added a new hook, "OutputPageScriptsForBottomQueue", to add modules to the
 -  bottom queue that should be requested in a dedicated <script> request.
  * (bug 66440) The MediaWiki web installer will now allow you to choose the skins
    to enable (from the ones included in download tarball) and decide which one
    should be the default.
@@@ -282,6 -284,8 +282,8 @@@ changes to languages because of Bugzill
    and filelinks tables. Run update.php to apply this change to the schema.
  * Removed File::sha1Base36(). (deprecated since 1.19)
  * Removed File::getPropsFromPath(). (deprecated since 1.19)
+ * Removed functions blockedPage(), noCreatePermission(), readOnlyPage() and
+   userNotLoggedInPage() from EditPage.php. (deprecated since 1.19)
  
  ==== Renamed classes ====
  * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression

diff --combined includes/EditPage.php
index 0a61a7e,7f9e7fc..5aea2fc
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -639,26 -639,6 +639,6 @@@ class EditPage 
                }
        }
  
-       /**
-        * Show a read-only error
-        * Parameters are the same as OutputPage:readOnlyPage()
-        * Redirect to the article page if redlink=1
-        * @deprecated since 1.19; use displayPermissionsError() instead
-        */
-       function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) {
-               wfDeprecated( __METHOD__, '1.19' );
- 
-               global $wgRequest, $wgOut;
-               if ( $wgRequest->getBool( 'redlink' ) ) {
-                       // The edit page was reached via a red link.
-                       // Redirect to the article page and let them click the edit tab if
-                       // they really want a permission error.
-                       $wgOut->redirect( $this->mTitle->getFullURL() );
-               } else {
-                       $wgOut->readOnlyPage( $source, $protected, $reasons, $action );
-               }
-       }
- 
        /**
         * Should we show a preview when the edit form is first shown?
         *
@@@ -2524,9 -2504,7 +2504,9 @@@
  
                $wgOut->addHTML( $this->editFormTextBeforeContent );
  
 -              if ( !$this->isCssJsSubpage && $showToolbar && $wgUser->getOption( 'showtoolbar' ) ) {
 +              if ( $this->contentModel === CONTENT_MODEL_WIKITEXT &&
 +                      $showToolbar && $wgUser->getOption( 'showtoolbar' ) )
 +              {
                        $wgOut->addHTML( EditPage::getEditToolbar() );
                }
  
@@@ -3904,40 -3882,6 +3884,6 @@@ HTM
                echo $s;
        }
  
-       /**
-        * Call the stock "user is blocked" page
-        *
-        * @deprecated since 1.19; throw an exception directly instead
-        */
-       function blockedPage() {
-               wfDeprecated( __METHOD__, '1.19' );
-               global $wgUser;
- 
-               throw new UserBlockedError( $wgUser->getBlock() );
-       }
- 
-       /**
-        * Produce the stock "please login to edit pages" page
-        *
-        * @deprecated since 1.19; throw an exception directly instead
-        */
-       function userNotLoggedInPage() {
-               wfDeprecated( __METHOD__, '1.19' );
-               throw new PermissionsError( 'edit' );
-       }
- 
-       /**
-        * Show an error page saying to the user that he has insufficient permissions
-        * to create a new page
-        *
-        * @deprecated since 1.19; throw an exception directly instead
-        */
-       function noCreatePermission() {
-               wfDeprecated( __METHOD__, '1.19' );
-               $permission = $this->mTitle->isTalkPage() ? 'createtalk' : 'createpage';
-               throw new PermissionsError( $permission );
-       }
- 
        /**
         * Creates a basic error page which informs the user that
         * they have attempted to edit a nonexistent section.