Skip to content

Commit

Permalink
Import: Avoid counting an uncountable type when reading arguments pas…
Browse files Browse the repository at this point in the history
…sed to a script.

Props josephscott.
Fixes #42898.
Built from https://develop.svn.wordpress.org/trunk@42771


git-svn-id: http://core.svn.wordpress.org/trunk@42601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
ocean90 committed Mar 2, 2018
1 parent de89365 commit d950c75
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions wp-admin/includes/class-wp-importer.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@ public function stop_the_insanity() {
*/
function get_cli_args( $param, $required = false ) {
$args = $_SERVER['argv'];
if ( ! is_array( $args ) ) {
$args = array();
}

$out = array();

Expand Down
2 changes: 1 addition & 1 deletion wp-includes/version.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.0-alpha-42770';
$wp_version = '5.0-alpha-42771';

/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
Expand Down

0 comments on commit d950c75

Please sign in to comment.