Skip to content

Commit

Permalink
Turn off magic_quotes_sybase. It prevents addslashes from escaping ba…
Browse files Browse the repository at this point in the history
…ckslashes. fixes #8757 for trunk

git-svn-id: http://svn.automattic.com/wordpress/trunk@10286 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
ryan committed Dec 31, 2008
1 parent 6bc4151 commit 8b34959
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
12 changes: 9 additions & 3 deletions wp-includes/functions.php
Expand Up @@ -529,6 +529,7 @@ function update_option( $option_name, $newvalue ) {
return true;
}

error_log(var_export($newvalue, true));
$notoptions = wp_cache_get( 'notoptions', 'options' );
if ( is_array( $notoptions ) && isset( $notoptions[$option_name] ) ) {
unset( $notoptions[$option_name] );
Expand All @@ -537,14 +538,17 @@ function update_option( $option_name, $newvalue ) {

$_newvalue = $newvalue;
$newvalue = maybe_serialize( $newvalue );

error_log(var_export($newvalue, true));

$alloptions = wp_load_alloptions();
if ( isset( $alloptions[$option_name] ) ) {
$alloptions[$option_name] = $newvalue;
wp_cache_set( 'alloptions', $alloptions, 'options' );
} else {
wp_cache_set( $option_name, $newvalue, 'options' );
}
$prep = $wpdb->prepare( "UPDATE $wpdb->options SET option_value = %s WHERE option_name = %s", $newvalue, $option_name );
error_log(var_export($prep, true));

$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->options SET option_value = %s WHERE option_name = %s", $newvalue, $option_name ) );
if ( $wpdb->rows_affected == 1 ) {
Expand Down Expand Up @@ -587,6 +591,7 @@ function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) {

wp_protect_special_option( $name );
$safe_name = $wpdb->escape( $name );
error_log('Incoming ' . var_export($value, true));
$value = sanitize_option( $name, $value );

// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
Expand All @@ -597,7 +602,7 @@ function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) {

$value = maybe_serialize( $value );
$autoload = ( 'no' === $autoload ) ? 'no' : 'yes';

error_log('Serialize ' . var_export($value, true));
if ( 'yes' == $autoload ) {
$alloptions = wp_load_alloptions();
$alloptions[$name] = $value;
Expand All @@ -612,7 +617,8 @@ function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) {
unset( $notoptions[$name] );
wp_cache_set( 'notoptions', $notoptions, 'options' );
}

$prep = $wpdb->prepare( "INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES (%s, %s, %s)", $name, $value, $autoload );
error_log('Prepare ' . var_export($prep, true));
$wpdb->query( $wpdb->prepare( "INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES (%s, %s, %s)", $name, $value, $autoload ) );

do_action( "add_option_{$name}", $name, $value );
Expand Down
2 changes: 2 additions & 0 deletions wp-settings.php
Expand Up @@ -15,6 +15,8 @@
if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < abs(intval(WP_MEMORY_LIMIT)) ) )
@ini_set('memory_limit', WP_MEMORY_LIMIT);

set_magic_quotes_runtime(0);
@ini_set('magic_quotes_sybase', 0);

/**
* Turn register globals off.
Expand Down

0 comments on commit 8b34959

Please sign in to comment.