sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert [35639] pending investigation into failures on PHP 5.2. 

See #19455


git-svn-id: https://develop.svn.wordpress.org/trunk@35641 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2015-11-16 00:53:30 +00:00
parent 1824468e8f
commit 002b44dc08
3 changed files with 1 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-includes/load.php
View File

@ -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 );

1
src/wp-settings.php
View File

@ -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' );

91
tests/phpunit/tests/load.php
View File

@ -1,91 +0,0 @@
<?php
/**
* @group load
*/
class Tests_Load extends WP_UnitTestCase {
public function setUp() {
parent::setUp();
ini_set( 'magic_quotes_sybase', 1 );
}
public function tearDown() {
unset( $_GET['ticket_19455'] );
unset( $_POST['ticket_19455'] );
unset( $_COOKIE['ticket_19455'] );
unset( $_SERVER['ticket_19455'] );
ini_set( 'magic_quotes_sybase', 0 );
parent::tearDown();
}
public function data_strings_and_expected_strings() {
return array(
array( 'A string with no quotes', 'A string with no quotes' ),
array( "Charlie's Little Cat", "Charlie\\'s Little Cat" ),
array( "A string with many quotes''''''", "A string with many quotes\\'\\'\\'\\'\\'\\'" ),
array(
"A string with quotes ' in '' different ''' places''''",
"A string with quotes \\' in \\'\\' different \\'\\'\\' places\\'\\'\\'\\'"
),
array( "A string with 'quoted' words", "A string with \\'quoted\\' words" ),
);
}
/**
* String in $_GET array is modified as expected
*
* @dataProvider data_strings_and_expected_strings
* @ticket 19455
*/
public function test_string_in_GET_array_is_modified_as_expected( $original, $expected ) {
$_GET['ticket_19455'] = $original;
wp_magic_quotes();
$this->assertEquals( $expected, $_GET['ticket_19455'] );
}
/**
* String in $_POST array is modified as expected
*
* @dataProvider data_strings_and_expected_strings
* @ticket 19455
*/
public function test_string_in_POST_array_is_modified_as_expected( $original, $expected ) {
$_POST['ticket_19455'] = $original;
wp_magic_quotes();
$this->assertEquals( $expected, $_POST['ticket_19455'] );
}
/**
* String in $_COOKIE array is modified as expected
*
* @dataProvider data_strings_and_expected_strings
* @ticket 19455
*/
public function test_string_in_COOKIE_array_is_modified_as_expected( $original, $expected ) {
$_COOKIE['ticket_19455'] = $original;
wp_magic_quotes();
$this->assertEquals( $expected, $_COOKIE['ticket_19455'] );
}
/**
* String in $_SERVER array is modified as expected
*
* @dataProvider data_strings_and_expected_strings
* @ticket 19455
*/
public function test_string_in_SERVER_array_is_modified_as_expected( $original, $expected ) {
$_SERVER['ticket_19455'] = $original;
wp_magic_quotes();
$this->assertEquals( $expected, $_SERVER['ticket_19455'] );
}
}