WordPress.org

Make WordPress Core

Changeset 37677


Ignore:
Timestamp:
06/10/2016 06:55:33 PM (4 years ago)
Author:
DrewAPicture
Message:

Boostrap: Move is_ssl() to wp-includes/load.php.

Moving to load.php introduces parity with other commonly evaluated is_*() functions such as is_admin() or is_multisite(). It also makes is_ssl() available much earlier in the loading process, such as for use in drop-ins like advanced-cache.php.

Props johnjamesjacoby.
Fixes #35844.

Location:
trunk/src/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/functions.php

    r37674 r37677  
    40544054
    40554055/**
    4056  * Determine if SSL is used.
    4057  *
    4058  * @since 2.6.0
    4059  *
    4060  * @return bool True if SSL, false if not used.
    4061  */
    4062 function is_ssl() {
    4063     if ( isset($_SERVER['HTTPS']) ) {
    4064         if ( 'on' == strtolower($_SERVER['HTTPS']) )
    4065             return true;
    4066         if ( '1' == $_SERVER['HTTPS'] )
    4067             return true;
    4068     } elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
    4069         return true;
    4070     }
    4071     return false;
    4072 }
    4073 
    4074 /**
    40754056 * Whether to force SSL used for the Administration Screens.
    40764057 *
  • trunk/src/wp-includes/load.php

    r37670 r37677  
    950950    return (bool) $installing;
    951951}
     952
     953/**
     954 * Determines if SSL is used.
     955 *
     956 * @since 2.6.0
     957 * @since 4.6.0 Moved from functions.php to load.php
     958 *
     959 * @return bool True if SSL, otherwise false.
     960 */
     961function is_ssl() {
     962    if ( isset( $_SERVER['HTTPS'] ) ) {
     963        if ( 'on' == strtolower( $_SERVER['HTTPS'] ) ) {
     964            return true;
     965        }
     966
     967        if ( '1' == $_SERVER['HTTPS'] ) {
     968            return true;
     969        }
     970    } elseif ( isset($_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
     971        return true;
     972    }
     973    return false;
     974}
Note: See TracChangeset for help on using the changeset viewer.