← Back to branch summary

~canonical-sysadmins/wordpress/4.2.4

« back to all changes in this revision

Viewing changes to wp-admin/includes/class-wp-importer.php

  • Committer: Paul Gear
  • Date: 2015-04-24 01:35:20 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: paul.gear@canonical.com-20150424013520-w4p9ksth76zh6opw
Merge new upstream release 4.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/class-wp-importer.php
6
6
        /**
7
7
         * Class Constructor
8
8
         *
9
 
         * @return void
10
9
         */
11
10
        public function __construct() {}
12
11
 
210
209
         */
211
210
        public function is_user_over_quota() {
212
211
                if ( function_exists( 'upload_is_user_over_quota' ) ) {
213
 
                        if ( upload_is_user_over_quota( 1 ) ) {
 
212
                        if ( upload_is_user_over_quota() ) {
214
213
                                echo "Sorry, you have used your upload quota.\n";
215
214
                                return true;
216
215
                        }
273
272
                        }
274
273
 
275
274
                        $last_arg = $key;
276
 
                } else if ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
 
275
                } elseif ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
277
276
                        for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
278
277
                                $key = $match[1]{$j};
279
278
                                $out[$key] = true;
280
279
                        }
281
280
 
282
281
                        $last_arg = $key;
283
 
                } else if ( $last_arg !== null ) {
 
282
                } elseif ( $last_arg !== null ) {
284
283
                        $out[$last_arg] = $args[$i];
285
284
                }
286
285
        }