enmi-conf.org: comparison wp/wp-admin/includes/class-wp-importer.php

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 	public function __construct() {}
 	/**
 	 * Returns array with imported permalinks from WordPress database
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param string $importer_name
 	 * @param string $bid
 	 * @return array
 	 */
 	public function get_imported_posts( $importer_name, $bid ) {
 		global $wpdb;
 		$offset = 0;
 		// Grab all posts in chunks
 		do {
 			$meta_key = $importer_name . '_' . $bid . '_permalink';
-			$sql = $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '%s' LIMIT %d,%d", $meta_key, $offset, $limit );
+			$sql = $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = %s LIMIT %d,%d", $meta_key, $offset, $limit );
 			$results = $wpdb->get_results( $sql );
 			// Increment offset
 			$offset = ( $limit + $offset );
 	}
 	/**
 	 * Return count of imported permalinks from WordPress database
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param string $importer_name
 	 * @param string $bid
 	 * @return int
 	 */
 	public function count_imported_posts( $importer_name, $bid ) {
 		global $wpdb;
 		return $count;
 	}
 	/**
 	 * Set array with imported comments from WordPress database
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param string $bid
 	 * @return array
 	 */
 	public function get_imported_comments( $bid ) {
 		unset( $results, $r );
 		return $hashtable;
 	}
+	/**
+	 *
+	 * @param int $blog_id
+	 * @return int|void
+	 */
 	public function set_blog( $blog_id ) {
 		if ( is_numeric( $blog_id ) ) {
 			$blog_id = (int) $blog_id;
 		} else {
 			$blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
 			if ( ( !$parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
 				fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
 				exit();
 			}
-			if ( empty( $parsed['path'] ) )
+			if ( empty( $parsed['path'] ) ) {
 				$parsed['path'] = '/';
-			$blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) );
+			}
-			if ( !$blog ) {
+			$blogs = get_sites( array( 'domain' => $parsed['host'], 'number' => 1, 'path' => $parsed['path'] ) );
+			if ( ! $blogs ) {
 				fwrite( STDERR, "Error: Could not find blog\n" );
 				exit();
 			}
+			$blog = array_shift( $blogs );
 			$blog_id = (int) $blog->blog_id;
 		}
 		if ( function_exists( 'is_multisite' ) ) {
 			if ( is_multisite() )
 		}
 		return $blog_id;
 	}
+	/**
+	 *
+	 * @param int $user_id
+	 * @return int|void
+	 */
 	public function set_user( $user_id ) {
 		if ( is_numeric( $user_id ) ) {
 			$user_id = (int) $user_id;
 		} else {
 			$user_id = (int) username_exists( $user_id );
 	 * GET URL
 	 *
 	 * @param string $url
 	 * @param string $username
 	 * @param string $password
-	 * @param bool $head
+	 * @param bool   $head
 	 * @return array
 	 */
 	public function get_page( $url, $username = '', $password = '', $head = false ) {
 		// Increase the timeout
 		add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
 	 * @return bool
 	 */
 	public function is_user_over_quota() {
 		if ( function_exists( 'upload_is_user_over_quota' ) ) {
 			if ( upload_is_user_over_quota() ) {
-				echo "Sorry, you have used your upload quota.\n";
 				return true;
 			}
 		}
 		return false;
 	public function min_whitespace( $string ) {
 		return preg_replace( '|[\r\n\t ]+|', ' ', $string );
 	}
 	/**
-	 * Reset global variables that grow out of control during imports
+	 * Resets global variables that grow out of control during imports.
 	 *
-	 * @return void
+	 * @since 3.0.0
+	 *
+	 * @global wpdb  $wpdb       WordPress database abstraction object.
+	 * @global array $wp_actions
 	 */
 	public function stop_the_insanity() {
 		global $wpdb, $wp_actions;
 		// Or define( 'WP_IMPORTING', true );
 		$wpdb->queries = array();
 /**
 * Returns value of command line params.
 * Exits when a required param is not set.
 *
 * @param string $param
-* @param bool $required
+* @param bool   $required
 * @return mixed
 */
 function get_cli_args( $param, $required = false ) {
 	$args = $_SERVER['argv'];

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9