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

equal deleted inserted replaced

-:346c88efed21
+:5e2f62d02dcd
 */
 class WP_Importer {
 	/**
 	 * Class Constructor
 	 *
-	 * @return void
+	 */
-	 */
+	public function __construct() {}
-	function __construct() {}
 	/**
 	 * Returns array with imported permalinks from WordPress database
 	 *
 	 * @param string $bid
 	 * @return array
 	 */
-	function get_imported_posts( $importer_name, $bid ) {
+	public function get_imported_posts( $importer_name, $bid ) {
 		global $wpdb;
 		$hashtable = array();
 		$limit = 100;
 					$hashtable[$r->meta_value] = intval( $r->post_id );
 				}
 			}
 		} while ( count( $results ) == $limit );
-		// unset to save memory
+		// Unset to save memory.
 		unset( $results, $r );
 		return $hashtable;
 	}
 	 * Return count of imported permalinks from WordPress database
 	 *
 	 * @param string $bid
 	 * @return int
 	 */
-	function count_imported_posts( $importer_name, $bid ) {
+	public function count_imported_posts( $importer_name, $bid ) {
 		global $wpdb;
 		$count = 0;
 		// Get count of permalinks
 		$result = $wpdb->get_results( $sql );
 		if ( !empty( $result ) )
 			$count = intval( $result[0]->cnt );
-		// unset to save memory
+		// Unset to save memory.
 		unset( $results );
 		return $count;
 	}
 	 * Set array with imported comments from WordPress database
 	 *
 	 * @param string $bid
 	 * @return array
 	 */
-	function get_imported_comments( $bid ) {
+	public function get_imported_comments( $bid ) {
 		global $wpdb;
 		$hashtable = array();
 		$limit = 100;
 					}
 				}
 			}
 		} 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 {
 			$blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
 			if ( ( !$parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
 		}
 		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 {
 			$user_id = (int) username_exists( $user_id );
 		}
 	 *
 	 * @param string $a
 	 * @param string $b
 	 * @return int
 	 */
-	function cmpr_strlen( $a, $b ) {
+	public function cmpr_strlen( $a, $b ) {
 		return strlen( $b ) - strlen( $a );
 	}
 	/**
 	 * GET URL
 	 * @param string $username
 	 * @param string $password
 	 * @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' ) );
 		$headers = array();
 		$args = array();
 	 * Bump up the request timeout for http requests
 	 *
 	 * @param int $val
 	 * @return int
 	 */
-	function bump_request_timeout( $val ) {
+	public function bump_request_timeout( $val ) {
 		return 60;
 	}
 	/**
 	 * Check if user has exceeded disk quota
 	 *
 	 * @return bool
 	 */
-	function 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;
 			}
 		}
 	 * Replace newlines, tabs, and multiple spaces with a single space
 	 *
 	 * @param string $string
 	 * @return string
 	 */
-	function min_whitespace( $string ) {
+	public function min_whitespace( $string ) {
 		return preg_replace( '|[\r\n\t ]+|', ' ', $string );
 	}
 	/**
 	 * Reset global variables that grow out of control during imports
 	 *
 	 * @return void
 	 */
-	function stop_the_insanity() {
+	public function stop_the_insanity() {
 		global $wpdb, $wp_actions;
 		// Or define( 'WP_IMPORTING', true );
 		$wpdb->queries = array();
 		// Reset $wp_actions to keep it from growing out of control
 		$wp_actions = array();
 			} else {
 				$out[$key] = true;
 			}
 			$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];
 		}
 	}
 	// Check array for specified param

changeset 5	5e2f62d02dcd
parent 0	d970ebf37754
child 7	cf61fcea0001