WordPress 4.2

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-importer.php

diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php
index b54573f67508b72e693196ed4fff57204329fe5a..ee10547deb58d45f620f4caeffec747c395b6420 100644 (file)
--- a/wp-admin/includes/class-wp-importer.php
+++ b/wp-admin/includes/class-wp-importer.php
@@ -6,7 +6,6 @@ class WP_Importer {
        /**
         * Class Constructor
         *
        /**
         * Class Constructor
         *

-        * @return void

         */
        public function __construct() {}
 
         */
        public function __construct() {}
 


@@ -210,7 +209,7 @@ class WP_Importer {
         */
        public function is_user_over_quota() {
                if ( function_exists( 'upload_is_user_over_quota' ) ) {
         */
        public function is_user_over_quota() {
                if ( function_exists( 'upload_is_user_over_quota' ) ) {

-                       if ( upload_is_user_over_quota( 1 ) ) {
+                       if ( upload_is_user_over_quota() ) {

                                echo "Sorry, you have used your upload quota.\n";
                                return true;
                        }
                                echo "Sorry, you have used your upload quota.\n";
                                return true;
                        }


@@ -273,14 +272,14 @@ function get_cli_args( $param, $required = false ) {
                        }
 
                        $last_arg = $key;
                        }
 
                        $last_arg = $key;

-               } else if ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
+               } elseif ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {

                        for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
                                $key = $match[1]{$j};
                                $out[$key] = true;
                        }
 
                        $last_arg = $key;
                        for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
                                $key = $match[1]{$j};
                                $out[$key] = true;
                        }
 
                        $last_arg = $key;

-               } else if ( $last_arg !== null ) {
+               } elseif ( $last_arg !== null ) {

                        $out[$last_arg] = $args[$i];
                }
        }
                        $out[$last_arg] = $args[$i];
                }
        }