Changeset 12486 for trunk/wp-includes/functions.php

Timestamp:

12/22/2009 01:42:58 PM (15 years ago)

Author:

westi

Message:

Revert [12485] as it breaks the functionality of is_serialized() and make more strings appear serialized. See #9930.

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -246 +246 @@
  */
 function is_serialized( $data ) {
-    return is_string($data) && preg_match('/^(N;)|([aOs]:[0-9]+:.*[;}])|([bid]:[0-9.E+-]+;)$/s', $data);
+    // if it isn't a string, it isn't serialized
+    if ( !is_string( $data ) )
+        return false;
+    $data = trim( $data );
+    if ( 'N;' == $data )
+        return true;
+    if ( !preg_match( '/^([adObis]):/', $data, $badions ) )
+        return false;
+    switch ( $badions[1] ) {
+        case 'a' :
+        case 'O' :
+        case 's' :
+            if ( preg_match( "/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data ) )
+                return true;
+            break;
+        case 'b' :
+        case 'i' :
+        case 'd' :
+            if ( preg_match( "/^{$badions[1]}:[0-9.E-]+;\$/", $data ) )
+                return true;
+            break;
+    }
+    return false;
 }