← Back to branch summary

~canonical-sysadmins/wordpress/4.5.2

« back to all changes in this revision

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

  • Committer: Manuel Seelaus
  • Date: 2015-12-09 17:47:18 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: manuel.seelaus@canonical.com-20151209174718-coxethm2swbeqksy
Merge WP4.4 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/class-wp-importer.php
12
12
        /**
13
13
         * Returns array with imported permalinks from WordPress database
14
14
         *
15
 
         * @global wpdb $wpdb
 
15
         * @global wpdb $wpdb WordPress database abstraction object.
16
16
         *
17
17
         * @param string $importer_name
18
18
         * @param string $bid
52
52
        /**
53
53
         * Return count of imported permalinks from WordPress database
54
54
         *
55
 
         * @global wpdb $wpdb
 
55
         * @global wpdb $wpdb WordPress database abstraction object.
56
56
         *
57
57
         * @param string $importer_name
58
58
         * @param string $bid
81
81
        /**
82
82
         * Set array with imported comments from WordPress database
83
83
         *
84
 
         * @global wpdb $wpdb
 
84
         * @global wpdb $wpdb WordPress database abstraction object.
85
85
         *
86
86
         * @param string $bid
87
87
         * @return array