← All changes
|
classes/helpers/FrmSerializedStringParserHelper.php
+1
-40
6.25.1
→
6.14
View file →
| @@ -40,48 +40,9 @@ | ||
| 40 | 40 | * @param string $string |
| 41 | 41 | * @return mixed |
| 42 | 42 | */ |
| 43 | 43 | public function parse( $string ) { |
| 44 | - $unserialized_data = $this->do_parse( new FrmStringReaderHelper( $string ) ); | |
| 45 | - | |
| 46 | - if ( is_array( $unserialized_data ) && $this->serialized_string_is_invalid( $string ) ) { | |
| 47 | - return array_filter( $unserialized_data, array( $this, 'serialized_value_is_valid' ) ); | |
| 48 | - } | |
| 49 | - | |
| 50 | - return $unserialized_data; | |
| 51 | - } | |
| 52 | - | |
| 53 | - /** | |
| 54 | - * Check if an unserialized value is valid. | |
| 55 | - * | |
| 56 | - * @since 6.20 | |
| 57 | - * | |
| 58 | - * @param mixed $value | |
| 59 | - * @return bool | |
| 60 | - */ | |
| 61 | - private function serialized_value_is_valid( $value ) { | |
| 62 | - return ! is_string( $value ) || strpos( $value, ';s:' ) === false; | |
| 63 | - } | |
| 64 | - | |
| 65 | - /** | |
| 66 | - * @since 6.20 | |
| 67 | - * | |
| 68 | - * @param string $string | |
| 69 | - * @return bool | |
| 70 | - */ | |
| 71 | - private function serialized_string_is_invalid( $string ) { | |
| 72 | - $invalid_substrings = array( | |
| 73 | - ';s:10:\"a"', | |
| 74 | - ';s:";', | |
| 75 | - ); | |
| 76 | - | |
| 77 | - foreach ( $invalid_substrings as $invalid ) { | |
| 78 | - if ( strpos( $string, $invalid ) !== false ) { | |
| 79 | - return true; | |
| 80 | - } | |
| 81 | - } | |
| 82 | - | |
| 83 | - return false; | |
| 44 | + return $this->do_parse( new FrmStringReaderHelper( $string ) ); | |
| 84 | 45 | } |
| 85 | 46 | |
| 86 | 47 | /** |
| 87 | 48 | * This is the recursive parser. |