Changeset 47453

Timestamp:

03/13/2020 09:05:02 PM (5 years ago)

Author:

SergeyBiryukov

Message:

General: Move maybe_serialize() to a more appropriate place in the file, before maybe_unserialize().

Rename the $original parameter of maybe_unserialize() to $data, for consistency with other serialization functions.

See #36416.

File:

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

trunk/src/wp-includes/functions.php

@@ -583 +583 @@
 
 /**
- * Unserialize value only if it was serialized.
+ * Serialize data, if needed.
+ *
+ * @since 2.0.5
+ *
+ * @param string|array|object $data Data that might be serialized.
+ * @return mixed A scalar data.
+ */
+function maybe_serialize( $data ) {
+    if ( is_array( $data ) || is_object( $data ) ) {
+        return serialize( $data );
+    }
+
+    /*
+     * Double serialization is required for backward compatibility.
+     * See https://core.trac.wordpress.org/ticket/12930
+     * Also the world will end. See WP 3.6.1.
+     */
+    if ( is_serialized( $data, false ) ) {
+        return serialize( $data );
+    }
+
+    return $data;
+}
+
+/**
+ * Unserialize data only if it was serialized.
  *
  * @since 2.0.0
  *
- * @param string $original Maybe unserialized original, if is needed.
+ * @param string $data Data that might be unserialized.
  * @return mixed Unserialized data can be any type.
  */
-function maybe_unserialize( $original ) {
-    if ( is_serialized( $original ) ) { // Don't attempt to unserialize data that wasn't serialized going in.
-        return @unserialize( $original );
-    }
-    return $original;
+function maybe_unserialize( $data ) {
+    if ( is_serialized( $data ) ) { // Don't attempt to unserialize data that wasn't serialized going in.
+        return @unserialize( $data );
+    }
+
+    return $data;
 }
 
@@ -694 +720 @@
         return true;
     }
-}
-
-/**
- * Serialize data, if needed.
- *
- * @since 2.0.5
- *
- * @param string|array|object $data Data that might be serialized.
- * @return mixed A scalar data
- */
-function maybe_serialize( $data ) {
-    if ( is_array( $data ) || is_object( $data ) ) {
-        return serialize( $data );
-    }
-
-    /*
-     * Double serialization is required for backward compatibility.
-     * See https://core.trac.wordpress.org/ticket/12930
-     * Also the world will end. See WP 3.6.1.
-     */
-    if ( is_serialized( $data, false ) ) {
-        return serialize( $data );
-    }
-
-    return $data;
 }