X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/542cf06a610bc430421351ace7a2cc45f393b990..c46e6dd20c438dddfea40c35935b877ac3e67daa:/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 8115ff2e..ee10547d 100644
--- a/wp-admin/includes/class-wp-importer.php
+++ b/wp-admin/includes/class-wp-importer.php
@@ -6,13 +6,8 @@ class WP_Importer {
 	/**
 	 * Class Constructor
 	 *
-	 * @return void
 	 */
-	function __construct() {}
-
-	function WP_Importer() {
-		$this->__construct();
-	}
+	public function __construct() {}
 
 	/**
 	 * Returns array with imported permalinks from WordPress database
@@ -20,7 +15,7 @@ class WP_Importer {
 	 * @param string $bid
 	 * @return array
 	 */
-	function get_imported_posts( $importer_name, $bid ) {
+	public function get_imported_posts( $importer_name, $bid ) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -45,7 +40,7 @@ class WP_Importer {
 			}
 		} while ( count( $results ) == $limit );
 
-		// unset to save memory
+		// Unset to save memory.
 		unset( $results, $r );
 
 		return $hashtable;
@@ -57,7 +52,7 @@ class WP_Importer {
 	 * @param string $bid
 	 * @return int
 	 */
-	function count_imported_posts( $importer_name, $bid ) {
+	public function count_imported_posts( $importer_name, $bid ) {
 		global $wpdb;
 
 		$count = 0;
@@ -71,7 +66,7 @@ class WP_Importer {
 		if ( !empty( $result ) )
 			$count = intval( $result[0]->cnt );
 
-		// unset to save memory
+		// Unset to save memory.
 		unset( $results );
 
 		return $count;
@@ -83,7 +78,7 @@ class WP_Importer {
 	 * @param string $bid
 	 * @return array
 	 */
-	function get_imported_comments( $bid ) {
+	public function get_imported_comments( $bid ) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -113,13 +108,13 @@ class WP_Importer {
 			}
 		} while ( count( $results ) == $limit );
 
-		// unset to save memory
+		// Unset to save memory.
 		unset( $results, $r );
 
 		return $hashtable;
 	}
 
-	function set_blog( $blog_id ) {
+	public function set_blog( $blog_id ) {
 		if ( is_numeric( $blog_id ) ) {
 			$blog_id = (int) $blog_id;
 		} else {
@@ -136,9 +131,6 @@ class WP_Importer {
 				exit();
 			}
 			$blog_id = (int) $blog->blog_id;
-			// Restore global $current_blog
-			global $current_blog;
-			$current_blog = $blog;
 		}
 
 		if ( function_exists( 'is_multisite' ) ) {
@@ -149,7 +141,7 @@ class WP_Importer {
 		return $blog_id;
 	}
 
-	function set_user( $user_id ) {
+	public function set_user( $user_id ) {
 		if ( is_numeric( $user_id ) ) {
 			$user_id = (int) $user_id;
 		} else {
@@ -171,7 +163,7 @@ class WP_Importer {
 	 * @param string $b
 	 * @return int
 	 */
-	function cmpr_strlen( $a, $b ) {
+	public function cmpr_strlen( $a, $b ) {
 		return strlen( $b ) - strlen( $a );
 	}
 
@@ -184,9 +176,9 @@ class WP_Importer {
 	 * @param bool $head
 	 * @return array
 	 */
-	function get_page( $url, $username = '', $password = '', $head = false ) {
+	public function get_page( $url, $username = '', $password = '', $head = false ) {
 		// Increase the timeout
-		add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
+		add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
 
 		$headers = array();
 		$args = array();
@@ -197,7 +189,7 @@ class WP_Importer {
 
 		$args['headers'] = $headers;
 
-		return wp_remote_request( $url, $args );
+		return wp_safe_remote_request( $url, $args );
 	}
 
 	/**
@@ -206,7 +198,7 @@ class WP_Importer {
 	 * @param int $val
 	 * @return int
 	 */
-	function bump_request_timeout( $val ) {
+	public function bump_request_timeout( $val ) {
 		return 60;
 	}
 
@@ -215,11 +207,9 @@ class WP_Importer {
 	 *
 	 * @return bool
 	 */
-	function is_user_over_quota() {
-		global $current_blog;
-
+	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;
 			}
@@ -234,7 +224,7 @@ class WP_Importer {
 	 * @param string $string
 	 * @return string
 	 */
-	function min_whitespace( $string ) {
+	public function min_whitespace( $string ) {
 		return preg_replace( '|[\r\n\t ]+|', ' ', $string );
 	}
 
@@ -243,7 +233,7 @@ class WP_Importer {
 	 *
 	 * @return void
 	 */
-	function stop_the_insanity() {
+	public function stop_the_insanity() {
 		global $wpdb, $wp_actions;
 		// Or define( 'WP_IMPORTING', true );
 		$wpdb->queries = array();
@@ -282,14 +272,14 @@ function get_cli_args( $param, $required = false ) {
 			}
 
 			$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;
-		} else if ( $last_arg !== null ) {
+		} elseif ( $last_arg !== null ) {
 			$out[$last_arg] = $args[$i];
 		}
 	}