Changeset 3234

Timestamp:

11/29/2005 07:58:50 AM (21 years ago)

Author:

matt

Message:

Part of a healthy balanced breakfast - fixes #1980

File:

• trunk/wp-includes/functions.php (modified) (6 diffs)

trunk/wp-includes/functions.php

@@ -258 +258 @@
 
 
+function maybe_unserialize($original) {
+        if ( $gm = @ unserialize($original) )
+                return $gm;
+        else
+                return $original;
+}
+
 /* Options functions */
 
@@ -287 +294 @@
                 $value = preg_replace('|/+$|', '', $value);
 
-        @ $kellogs = unserialize($value);
-        if ( $kellogs !== FALSE )
-                return apply_filters('option_' . $setting, $kellogs);
-        else
-                return apply_filters('option_' . $setting, $value);
+        return apply_filters( 'option_' . $setting, maybe_unserialize($value) );
 }
 
@@ -329 +332 @@
                 if ( 'category_base' == $option->option_name )
                         $option->option_value = preg_replace('|/+$|', '', $option->option_value);
-                @ $value = unserialize($option->option_value);
-                if ( $value === FALSE )
-                        $value = $option->option_value;
+                $value = maybe_unserialize($option->option_value);
                 $all_options->{$option->option_name} = apply_filters('pre_option_' . $option->option_name, $value);
         }
@@ -460 +461 @@
         if ( isset($post_meta_cache[$post_id][$key]) ) {
                 if ( $single ) {
-                        return $post_meta_cache[$post_id][$key][0];
+                        return maybe_unserialize( $post_meta_cache[$post_id][$key][0] );
                 } else {
-                        return $post_meta_cache[$post_id][$key];
+                        return maybe_unserialize( $post_meta_cache[$post_id][$key][0] );
                 }
         }
@@ -477 +478 @@
         if ( $single ) {
                 if ( count($values) ) {
-                        $return = $values[0];
+                        $return = maybe_unserialize( $values[0] );
                 } else {
                         return '';
@@ -485 +486 @@
         }
 
-        @ $kellogs = unserialize($return);
-        if ( $kellogs !== FALSE )
-                return $kellogs;
-        else return $return;
+        return maybe_unserialize($return);
 }