WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In update_option(), call the update_option hook before the DB update. 

Merges [25925] to the 3.7 branch.

Reverses a regression from [25664].

props calin.
fixes #25705.

Built from https://develop.svn.wordpress.org/branches/3.7@25926


git-svn-id: http://core.svn.wordpress.org/branches/3.7@25885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-26 02:58:09 +00:00
parent 45cb40226f
commit 6098b84f76
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/option.php
View File

@ -236,6 +236,7 @@ function update_option( $option, $value ) {
$serialized_value = maybe_serialize( $value ); $serialized_value = maybe_serialize( $value );
do_action( 'update_option', $option, $old_value, $value );
$result = $wpdb->update( $wpdb->options, array( 'option_value' => $serialized_value ), array( 'option_name' => $option ) ); $result = $wpdb->update( $wpdb->options, array( 'option_value' => $serialized_value ), array( 'option_name' => $option ) );
if ( ! $result ) if ( ! $result )
return false; return false;
@ -246,7 +247,6 @@ function update_option( $option, $value ) {
wp_cache_set( 'notoptions', $notoptions, 'options' ); wp_cache_set( 'notoptions', $notoptions, 'options' );
} }
do_action( 'update_option', $option, $old_value, $value );
if ( ! defined( 'WP_INSTALLING' ) ) { if ( ! defined( 'WP_INSTALLING' ) ) {
$alloptions = wp_load_alloptions(); $alloptions = wp_load_alloptions();
if ( isset( $alloptions[$option] ) ) { if ( isset( $alloptions[$option] ) ) {