Merge "Remove unused title parameter from EditPage::getEditToolbar()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 10 May 2019 16:20:09 +0000 (16:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 10 May 2019 16:20:09 +0000 (16:20 +0000)
1  2 
includes/EditPage.php

diff --combined includes/EditPage.php
@@@ -2934,7 -2934,7 +2934,7 @@@ ERROR
                }
  
                if ( !$this->mTitle->isUserConfigPage() ) {
-                       $out->addHTML( self::getEditToolbar( $this->mTitle ) );
+                       $out->addHTML( self::getEditToolbar() );
                }
  
                if ( $this->blankArticle ) {
        /**
         * Allow extensions to provide a toolbar.
         *
-        * @param Title|null $title Title object for the page being edited (optional)
         * @return string|null
         */
-       public static function getEditToolbar( $title = null ) {
+       public static function getEditToolbar() {
                $startingToolbar = '<div id="toolbar"></div>';
                $toolbar = $startingToolbar;
  
                $out->addReturnTo( $this->getContextTitle(), [ 'action' => 'edit' ] );
        }
  
 -      /**
 -       * Filter an input field through a Unicode de-armoring process if it
 -       * came from an old browser with known broken Unicode editing issues.
 -       *
 -       * @deprecated since 1.30, does nothing
 -       *
 -       * @param WebRequest $request
 -       * @param string $field
 -       * @return string
 -       */
 -      protected function safeUnicodeInput( $request, $field ) {
 -              return rtrim( $request->getText( $field ) );
 -      }
 -
 -      /**
 -       * Filter an output field through a Unicode armoring process if it is
 -       * going to an old browser with known broken Unicode editing issues.
 -       *
 -       * @deprecated since 1.30, does nothing
 -       *
 -       * @param string $text
 -       * @return string
 -       */
 -      protected function safeUnicodeOutput( $text ) {
 -              return $text;
 -      }
 -
        /**
         * @since 1.29
         */