Use `PHP_SAPI` constant instead of `php_sapi_name()` in `iis7_supports_permalinks()`, `wp_fix_server_vars()`, and `wp_redirect()`.
See #30799. Built from https://develop.svn.wordpress.org/trunk@31120 git-svn-id: http://core.svn.wordpress.org/trunk@31101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
afd09f1f04
commit
ac654632fe
|
@ -3619,7 +3619,7 @@ function iis7_supports_permalinks() {
|
|||
* Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
|
||||
* via ISAPI then pretty permalinks will not work.
|
||||
*/
|
||||
$supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( php_sapi_name() == 'cgi-fcgi' );
|
||||
$supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( PHP_SAPI == 'cgi-fcgi' );
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -52,7 +52,7 @@ function wp_fix_server_vars() {
|
|||
$_SERVER = array_merge( $default_server_values, $_SERVER );
|
||||
|
||||
// Fix for IIS when running with PHP ISAPI
|
||||
if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
|
||||
if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
|
||||
|
||||
// IIS Mod-Rewrite
|
||||
if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
|
||||
|
|
|
@ -1172,7 +1172,7 @@ function wp_redirect($location, $status = 302) {
|
|||
|
||||
$location = wp_sanitize_redirect($location);
|
||||
|
||||
if ( !$is_IIS && php_sapi_name() != 'cgi-fcgi' )
|
||||
if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' )
|
||||
status_header($status); // This causes problems on IIS and some FastCGI setups
|
||||
|
||||
header("Location: $location", true, $status);
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.2-alpha-31119';
|
||||
$wp_version = '4.2-alpha-31120';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
Loading…
Reference in New Issue