From 43bc6dc931b149769b7c142a2257d12c9cfa83f4 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Mon, 16 Nov 2015 00:54:28 +0000 Subject: [PATCH] Revert [35639] pending investigation into failures on PHP 5.2. See #19455 Built from https://develop.svn.wordpress.org/trunk@35641 git-svn-id: http://core.svn.wordpress.org/trunk@35605 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/load.php | 3 --- wp-includes/version.php | 2 +- wp-settings.php | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wp-includes/load.php b/wp-includes/load.php index 70b748691f..1275acad37 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -603,9 +603,6 @@ function wp_magic_quotes() { $_COOKIE = stripslashes_deep( $_COOKIE ); } - // Turn off sybase quoting after stripslashes has run - @ini_set( 'magic_quotes_sybase', 0 ); - // Escape with wpdb. $_GET = add_magic_quotes( $_GET ); $_POST = add_magic_quotes( $_POST ); diff --git a/wp-includes/version.php b/wp-includes/version.php index bcadd99188..c4f9c52298 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-beta4-35640'; +$wp_version = '4.4-beta4-35641'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index bb2043e43a..1c5da84923 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -46,6 +46,7 @@ wp_check_php_mysql_versions(); // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php. @ini_set( 'magic_quotes_runtime', 0 ); +@ini_set( 'magic_quotes_sybase', 0 ); // WordPress calculates offsets from UTC. date_default_timezone_set( 'UTC' );