Merge "WebInstaller::getDocUrl: Use getUrl to generate the URL"

diff --combined includes/installer/WebInstaller.php
index 306afc4,d754a37..9dc54a2
--- 1/includes/installer/WebInstaller.php
--- 2/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@@ -717,7 -717,7 +717,7 @@@ class WebInstaller extends Installer 
         */
        public function showHelpBox( $msg /*, ... */ ) {
                $args = func_get_args();
 -              $html = call_user_func_array( [ $this, 'getHelpBox' ], $args );
 +              $html = $this->getHelpBox( ...$args );
                $this->output->addHTML( $html );
        }
  
@@@ -742,7 -742,7 +742,7 @@@
        public function showStatusMessage( Status $status ) {
                $errors = array_merge( $status->getErrorsArray(), $status->getWarningsArray() );
                foreach ( $errors as $error ) {
 -                      call_user_func_array( [ $this, 'showMessage' ], $error );
 +                      $this->showMessage( ...$error );
                }
        }
  
@@@ -1121,13 -1121,13 +1121,13 @@@
         * @return string
         */
        protected function getDocUrl( $page ) {
-               $url = "{$_SERVER['PHP_SELF']}?page=" . urlencode( $page );
+               $query = [ 'page' => $page ];
  
                if ( in_array( $this->currentPageName, $this->pageSequence ) ) {
-                       $url .= '&lastPage=' . urlencode( $this->currentPageName );
+                       $query['lastPage'] = $this->currentPageName;
                }
  
-               return $url;
+               return $this->getUrl( $query );
        }
  
        /**