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

Don't return if is_string(). Proceed to check if is_serialized(). fixes #7347 for trunk

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@8372 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2008-07-18 16:43:23 +00:00
parent 5000a39eb0
commit 2be6bcf255
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/functions.php
View File

@ -630,12 +630,12 @@ function delete_option( $name ) {
* @return mixed A scalar data
*/
function maybe_serialize( $data ) {
if ( is_string( $data ) )
return $data;
elseif ( is_array( $data ) || is_object( $data ) )
if ( is_array( $data ) || is_object( $data ) )
return serialize( $data );
if ( is_serialized( $data ) )
return serialize( $data );
return $data;
}