Skip to content

Commit 70b4ba1

Browse files
authored
Merge pull request #148 from TimothyBJacobs/fix/147
2 parents 7b772e8 + 08f795f commit 70b4ba1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"wp-cli/wp-cli": "^2"
15+
"wp-cli/wp-cli": "dev-master"
1616
},
1717
"require-dev": {
1818
"wp-cli/db-command": "^1.3 || ^2",

src/WP_CLI/SearchReplacer.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ private function run_recursively( $data, $serialised, $recursion_level = 0, $vis
8383
}
8484
}
8585

86-
$unserialized = @unserialize( $data );
87-
if ( is_string( $data ) && false !== $unserialized ) {
86+
$unserialized = is_string( $data ) ? @unserialize( $data ) : false;
87+
if ( false !== $unserialized ) {
8888
$data = $this->run_recursively( $unserialized, true, $recursion_level + 1 );
8989
} elseif ( is_array( $data ) ) {
9090
$keys = array_keys( $data );
@@ -180,4 +180,3 @@ private function preg_error_message( $error ) {
180180
: '<unknown error>';
181181
}
182182
}
183-

0 commit comments

Comments
 (0)