Remove WebRequest::checkSessionCookie() method as being deprecated

[lhc/web/wiklou.git] / includes / WebRequest.php
diff --git a/includes/WebRequest.php b/includes/WebRequest.php

index 0065135..3bbdc3f 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -113,7 +113,7 @@ class WebRequest {
          */
         public static function getPathInfo( $want = 'all' ) {
                 global $wgUsePathInfo;
-               // PATH_INFO is mangled due to http://bugs.php.net/bug.php?id=31892
+               // PATH_INFO is mangled due to https://bugs.php.net/bug.php?id=31892
                 // And also by Apache 2.x, double slashes are converted to single slashes.
                 // So we will use REQUEST_URI if possible.
                 $matches = [];
@@ -175,7 +175,7 @@ class WebRequest {
                 } elseif ( $wgUsePathInfo ) {
                         if ( isset( $_SERVER['ORIG_PATH_INFO'] ) && $_SERVER['ORIG_PATH_INFO'] != '' ) {
                                 // Mangled PATH_INFO
-                               // http://bugs.php.net/bug.php?id=31892
+                               // https://bugs.php.net/bug.php?id=31892
                                 // Also reported when ini_get('cgi.fix_pathinfo')==false
                                 $matches['title'] = substr( $_SERVER['ORIG_PATH_INFO'], 1 );
  
@@ -238,7 +238,7 @@ class WebRequest {
          * This is for use prior to Setup.php, when no WebRequest object is available.
          * At other times, use the non-static function getProtocol().
          *
-        * @return array
+        * @return string
          */
         public static function detectProtocol() {
                 if ( ( !empty( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] !== 'off' ) ||
@@ -379,7 +379,7 @@ class WebRequest {
          */
         private function getGPCVal( $arr, $name, $default ) {
                 # PHP is so nice to not touch input data, except sometimes:
-               # http://us2.php.net/variables.external#language.variables.external.dot-in-names
+               # https://secure.php.net/variables.external#language.variables.external.dot-in-names
                 # Work around PHP *feature* to avoid *bugs* elsewhere.
                 $name = strtr( $name, '.', '_' );
                 if ( isset( $arr[$name] ) ) {
@@ -757,22 +757,6 @@ class WebRequest {
                 return $this->sessionId;
         }
  
-       /**
-        * Returns true if the request has a persistent session.
-        * This does not necessarily mean that the user is logged in!
-        *
-        * @deprecated since 1.27, use
-        *  \MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId()
-        *  instead.
-        * @return bool
-        */
-       public function checkSessionCookie() {
-               global $wgInitialSessionId;
-               wfDeprecated( __METHOD__, '1.27' );
-               return $wgInitialSessionId !== null &&
-                       $this->getSession()->getId() === (string)$wgInitialSessionId;
-       }
-
         /**
          * Get a cookie from the $_COOKIE jar
          *
@@ -1099,6 +1083,7 @@ class WebRequest {
                 header( 'Content-Type: text/html' );
                 $encUrl = htmlspecialchars( $url );
                 echo <<<HTML
+<!DOCTYPE html>
  <html>
  <head>
  <title>Security redirect</title>