enmi-conf.org: comparison wp/wp-includes/class-wp-xmlrpc-server.php

equal deleted inserted replaced

-:48c4eec2b7e6
+:8c2e4d02f4ef
 	 *
 	 * @param string $username User's username.
 	 * @param string $password User's password.
 	 * @return WP_User|false WP_User object if authentication passed, false otherwise.
 	 */
-	public function login( $username, $password ) {
+	public function login(
+		$username,
+		#[\SensitiveParameter]
+		$password
+	) {
 		if ( ! $this->is_enabled ) {
 			$this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.' ) ) );
 			return false;
 		}
 	 *
 	 * @param string $username User's username.
 	 * @param string $password User's password.
 	 * @return bool Whether authentication passed.
 	 */
-	public function login_pass_ok( $username, $password ) {
+	public function login_pass_ok(
+		$username,
+		#[\SensitiveParameter]
+		$password
+	) {
 		return (bool) $this->login( $username, $password );
 	}
 	/**
 	 * Escapes string or array of strings for database.
 		foreach ( (array) $fields as $meta ) {
 			if ( isset( $meta['id'] ) ) {
 				$meta['id'] = (int) $meta['id'];
 				$pmeta      = get_metadata_by_mid( 'post', $meta['id'] );
-				if ( ! $pmeta || $pmeta->post_id != $post_id ) {
+				if ( ! $pmeta || (int) $pmeta->post_id !== $post_id ) {
 					continue;
 				}
 				if ( isset( $meta['key'] ) ) {
 					$meta['key'] = wp_unslash( $meta['key'] );
 		 * @param array|string     $args   The escaped arguments passed to the method.
 		 * @param wp_xmlrpc_server $server The XML-RPC server instance.
 		 */
 		do_action( 'xmlrpc_call', 'wp.getUsersBlogs', $args, $this );
-		$blogs           = (array) get_blogs_of_user( $user->ID );
+		$blogs  = (array) get_blogs_of_user( $user->ID );
-		$struct          = array();
+		$struct = array();
 		$primary_blog_id = 0;
 		$active_blog     = get_active_blog_for_user( $user->ID );
 		if ( $active_blog ) {
 			$primary_blog_id = (int) $active_blog->blog_id;
 		}
+		$current_network_id = get_current_network_id();
 		foreach ( $blogs as $blog ) {
 			// Don't include blogs that aren't hosted at this site.
-			if ( get_current_network_id() != $blog->site_id ) {
+			if ( $blog->site_id !== $current_network_id ) {
 				continue;
 			}
 			$blog_id = $blog->userblog_id;
 	 */
 	protected function _prepare_comment( $comment ) {
 		// Format page date.
 		$comment_date_gmt = $this->_convert_date_gmt( $comment->comment_date_gmt, $comment->comment_date );
-		if ( '0' == $comment->comment_approved ) {
+		if ( '0' === $comment->comment_approved ) {
 			$comment_status = 'hold';
 		} elseif ( 'spam' === $comment->comment_approved ) {
 			$comment_status = 'spam';
-		} elseif ( '1' == $comment->comment_approved ) {
+		} elseif ( '1' === $comment->comment_approved ) {
 			$comment_status = 'approve';
 		} else {
 			$comment_status = $comment->comment_approved;
 		}
 		$_comment = array(
 		if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type.' ) );
 		}
 		$post_data['post_author'] = absint( $post_data['post_author'] );
-		if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] != $user->ID ) {
+		if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] !== $user->ID ) {
 			if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
 			}
 			$author = get_userdata( $post_data['post_author'] );
 		}
 		// Do some timestamp voodoo.
 		if ( ! empty( $post_data['post_date_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
-			$dateCreated = rtrim( $post_data['post_date_gmt']->getIso(), 'Z' ) . 'Z';
+			$date_created = rtrim( $post_data['post_date_gmt']->getIso(), 'Z' ) . 'Z';
 		} elseif ( ! empty( $post_data['post_date'] ) ) {
-			$dateCreated = $post_data['post_date']->getIso();
+			$date_created = $post_data['post_date']->getIso();
 		}
 		// Default to not flagging the post date to be edited unless it's intentional.
 		$post_data['edit_date'] = false;
-		if ( ! empty( $dateCreated ) ) {
+		if ( ! empty( $date_created ) ) {
-			$post_data['post_date']     = iso8601_to_datetime( $dateCreated );
+			$post_data['post_date']     = iso8601_to_datetime( $date_created );
-			$post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'gmt' );
+			$post_data['post_date_gmt'] = iso8601_to_datetime( $date_created, 'gmt' );
 			// Flag the post date to be edited.
 			$post_data['edit_date'] = true;
 		}
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this category.' ) );
 		}
 		$status = wp_delete_term( $category_id, 'category' );
-		if ( true == $status ) {
+		if ( true === $status ) {
 			/**
 			 * Fires after a category has been successfully deleted via XML-RPC.
 			 *
 			 * @since 3.4.0
 			 *
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deleteComment', $args, $this );
 		$status = wp_delete_comment( $comment_id );
-		if ( $status ) {
+		if ( true === $status ) {
 			/**
 			 * Fires after a comment has been successfully deleted via XML-RPC.
 			 *
 			 * @since 3.4.0
 			 *
 		}
 		// Do some timestamp voodoo.
 		if ( ! empty( $content_struct['date_created_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
-			$dateCreated                 = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
+			$date_created = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-			$comment['comment_date']     = get_date_from_gmt( $dateCreated );
-			$comment['comment_date_gmt'] = iso8601_to_datetime( $dateCreated, 'gmt' );
+			$comment['comment_date']     = get_date_from_gmt( $date_created );
+			$comment['comment_date_gmt'] = iso8601_to_datetime( $date_created, 'gmt' );
 		}
 		if ( isset( $content_struct['content'] ) ) {
 			$comment['comment_content'] = $content_struct['content'];
 		}
 		if ( is_wp_error( $comment_id ) ) {
 			return new IXR_Error( 403, $comment_id->get_error_message() );
 		}
 		if ( ! $comment_id ) {
-			return new IXR_Error( 403, __( 'Something went wrong.' ) );
+			return new IXR_Error( 403, __( 'An error occurred while processing your comment. Please ensure all fields are filled correctly and try again.' ) );
 		}
 		/**
 		 * Fires after a new comment has been successfully created via XML-RPC.
 		 *
 			$option_names[] = $o_name;
 			if ( ! array_key_exists( $o_name, $this->blog_options ) ) {
 				continue;
 			}
-			if ( true == $this->blog_options[ $o_name ]['readonly'] ) {
+			if ( $this->blog_options[ $o_name ]['readonly'] ) {
 				continue;
 			}
 			update_option( $this->blog_options[ $o_name ]['option'], wp_unslash( $o_value ) );
 		}
 		$blogs = $this->wp_getUsersBlogs( $args );
 		if ( $blogs instanceof IXR_Error ) {
 			return $blogs;
 		}
-		if ( $_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path ) {
+		if ( $_SERVER['HTTP_HOST'] === $domain && $_SERVER['REQUEST_URI'] === $path ) {
 			return $blogs;
 		} else {
 			foreach ( (array) $blogs as $blog ) {
 				if ( str_contains( $blog['url'], $_SERVER['HTTP_HOST'] ) ) {
 					return array( $blog );
 		do_action( 'xmlrpc_call', 'blogger.getRecentPosts', $args, $this );
 		$posts_list = wp_get_recent_posts( $query );
 		if ( ! $posts_list ) {
-			$this->error = new IXR_Error( 500, __( 'Either there are no posts, or something went wrong.' ) );
+			$this->error = new IXR_Error( 500, __( 'No posts found or an error occurred while retrieving posts.' ) );
 			return $this->error;
 		}
 		$recent_posts = array();
 		foreach ( $posts_list as $entry ) {
 		$post_content  = xmlrpc_removepostdata( $content );
 		$post_date     = current_time( 'mysql' );
 		$post_date_gmt = current_time( 'mysql', 1 );
-		$post_data = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status' );
+		$post_data = compact(
+			'post_author',
+			'post_date',
+			'post_date_gmt',
+			'post_content',
+			'post_title',
+			'post_category',
+			'post_status'
+		);
 		$post_id = wp_insert_post( $post_data );
 		if ( is_wp_error( $post_id ) ) {
 			return new IXR_Error( 500, $post_id->get_error_message() );
 		}
 			$menu_order = $content_struct['wp_page_order'];
 		}
 		$post_author = $user->ID;
-		// If an author id was provided then use it instead.
+		// If an author ID was provided then use it instead.
-		if ( isset( $content_struct['wp_author_id'] ) && ( $user->ID != $content_struct['wp_author_id'] ) ) {
+		if ( isset( $content_struct['wp_author_id'] ) && ( $user->ID !== (int) $content_struct['wp_author_id'] ) ) {
 			switch ( $post_type ) {
 				case 'post':
 					if ( ! current_user_can( 'edit_others_posts' ) ) {
 						return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
 					}
 		}
 		// Do some timestamp voodoo.
 		if ( ! empty( $content_struct['date_created_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
-			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
+			$date_created = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
 		} elseif ( ! empty( $content_struct['dateCreated'] ) ) {
-			$dateCreated = $content_struct['dateCreated']->getIso();
+			$date_created = $content_struct['dateCreated']->getIso();
 		}
 		$post_date     = '';
 		$post_date_gmt = '';
-		if ( ! empty( $dateCreated ) ) {
+		if ( ! empty( $date_created ) ) {
-			$post_date     = iso8601_to_datetime( $dateCreated );
+			$post_date     = iso8601_to_datetime( $date_created );
-			$post_date_gmt = iso8601_to_datetime( $dateCreated, 'gmt' );
+			$post_date_gmt = iso8601_to_datetime( $date_created, 'gmt' );
 		}
 		$post_category = array();
 		if ( isset( $content_struct['categories'] ) ) {
 			$catnames = $content_struct['categories'];
 					$post_category[] = get_cat_ID( $cat );
 				}
 			}
 		}
-		$postdata = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input', 'page_template' );
+		$postdata = compact(
+			'post_author',
+			'post_date',
+			'post_date_gmt',
+			'post_content',
+			'post_title',
+			'post_category',
+			'post_status',
+			'post_excerpt',
+			'comment_status',
+			'ping_status',
+			'to_ping',
+			'post_type',
+			'post_name',
+			'post_password',
+			'post_parent',
+			'menu_order',
+			'tags_input',
+			'page_template'
+		);
 		$post_id        = get_default_post_to_edit( $post_type, true )->ID;
 		$postdata['ID'] = $post_id;
 		// Only posts can be sticky.
 			unset( $content_struct['wp_post_thumbnail'] );
 		}
 		// Handle enclosures.
-		$thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
+		$enclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
-		$this->add_enclosure_if_new( $post_id, $thisEnclosure );
+		$this->add_enclosure_if_new( $post_id, $enclosure );
 		$this->attach_uploads( $post_id, $post_content );
 		/*
 		 * Handle post formats if assigned, value is validated earlier
 		if ( ! in_array( $postdata['post_type'], array( 'post', 'page' ), true ) ) {
 			return new IXR_Error( 401, __( 'Invalid post type.' ) );
 		}
 		// Thwart attempt to change the post type.
-		if ( ! empty( $content_struct['post_type'] ) && ( $content_struct['post_type'] != $postdata['post_type'] ) ) {
+		if ( ! empty( $content_struct['post_type'] ) && ( $content_struct['post_type'] !== $postdata['post_type'] ) ) {
 			return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
 		}
 		// Check for a valid post format if one was given.
 		if ( isset( $content_struct['wp_post_format'] ) ) {
 			}
 		}
 		$this->escape( $postdata );
-		$ID             = $postdata['ID'];
+		$post_id        = $postdata['ID'];
 		$post_content   = $postdata['post_content'];
 		$post_title     = $postdata['post_title'];
 		$post_excerpt   = $postdata['post_excerpt'];
 		$post_password  = $postdata['post_password'];
 		$post_parent    = $postdata['post_parent'];
 			$page_template = $content_struct['wp_page_template'];
 		}
 		$post_author = $postdata['post_author'];
-		// If an author id was provided then use it instead.
+		// If an author ID was provided then use it instead.
 		if ( isset( $content_struct['wp_author_id'] ) ) {
 			// Check permissions if attempting to switch author to or from another user.
-			if ( $user->ID != $content_struct['wp_author_id'] || $user->ID != $post_author ) {
+			if ( $user->ID !== (int) $content_struct['wp_author_id'] || $user->ID !== (int) $post_author ) {
 				switch ( $post_type ) {
 					case 'post':
 						if ( ! current_user_can( 'edit_others_posts' ) ) {
 							return new IXR_Error( 401, __( 'Sorry, you are not allowed to change the post author as this user.' ) );
 						}
 		}
 		// Do some timestamp voodoo.
 		if ( ! empty( $content_struct['date_created_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
-			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
+			$date_created = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
 		} elseif ( ! empty( $content_struct['dateCreated'] ) ) {
-			$dateCreated = $content_struct['dateCreated']->getIso();
+			$date_created = $content_struct['dateCreated']->getIso();
 		}
 		// Default to not flagging the post date to be edited unless it's intentional.
 		$edit_date = false;
-		if ( ! empty( $dateCreated ) ) {
+		if ( ! empty( $date_created ) ) {
-			$post_date     = iso8601_to_datetime( $dateCreated );
+			$post_date     = iso8601_to_datetime( $date_created );
-			$post_date_gmt = iso8601_to_datetime( $dateCreated, 'gmt' );
+			$post_date_gmt = iso8601_to_datetime( $date_created, 'gmt' );
 			// Flag the post date to be edited.
 			$edit_date = true;
 		} else {
 			$post_date     = $postdata['post_date'];
 			$post_date_gmt = $postdata['post_date_gmt'];
 		}
+		$newpost = array(
+			'ID' => $post_id,
+		);
+		$newpost += compact(
+			'post_content',
+			'post_title',
+			'post_category',
+			'post_status',
+			'post_excerpt',
+			'comment_status',
+			'ping_status',
+			'edit_date',
+			'post_date',
+			'post_date_gmt',
+			'to_ping',
+			'post_name',
+			'post_password',
+			'post_parent',
+			'menu_order',
+			'post_author',
+			'tags_input',
+			'page_template'
+		);
 		// We've got all the data -- post it.
-		$newpost = compact( 'ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'edit_date', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template' );
 		$result = wp_update_post( $newpost, true );
 		if ( is_wp_error( $result ) ) {
 			return new IXR_Error( 500, $result->get_error_message() );
 		}
 			}
 			unset( $content_struct['wp_post_thumbnail'] );
 		}
 		// Handle enclosures.
-		$thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
+		$enclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
-		$this->add_enclosure_if_new( $post_id, $thisEnclosure );
+		$this->add_enclosure_if_new( $post_id, $enclosure );
-		$this->attach_uploads( $ID, $post_content );
+		$this->attach_uploads( $post_id, $post_content );
 		// Handle post formats if assigned, validation is handled earlier in this function.
 		if ( isset( $content_struct['wp_post_format'] ) ) {
 			set_post_format( $post_id, $content_struct['wp_post_format'] );
 		}
 			$post_date_gmt     = $this->_convert_date_gmt( $postdata['post_date_gmt'], $postdata['post_date'] );
 			$post_modified     = $this->_convert_date( $postdata['post_modified'] );
 			$post_modified_gmt = $this->_convert_date_gmt( $postdata['post_modified_gmt'], $postdata['post_modified'] );
 			$categories = array();
-			$catids     = wp_get_post_categories( $post_id );
+			$cat_ids    = wp_get_post_categories( $post_id );
-			foreach ( $catids as $catid ) {
+			foreach ( $cat_ids as $cat_id ) {
-				$categories[] = get_cat_name( $catid );
+				$categories[] = get_cat_name( $cat_id );
 			}
 			$tagnames = array();
 			$tags     = wp_get_post_tags( $post_id );
 			if ( ! empty( $tags ) ) {
 			$post_date_gmt     = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
 			$post_modified     = $this->_convert_date( $entry['post_modified'] );
 			$post_modified_gmt = $this->_convert_date_gmt( $entry['post_modified_gmt'], $entry['post_modified'] );
 			$categories = array();
-			$catids     = wp_get_post_categories( $entry['ID'] );
+			$cat_ids    = wp_get_post_categories( $entry['ID'] );
-			foreach ( $catids as $catid ) {
+			foreach ( $cat_ids as $cat_id ) {
-				$categories[] = get_cat_name( $catid );
+				$categories[] = get_cat_name( $cat_id );
 			}
 			$tagnames = array();
 			$tags     = wp_get_post_tags( $entry['ID'] );
 			if ( ! empty( $tags ) ) {
 		}
 		$upload = wp_upload_bits( $name, null, $bits );
 		if ( ! empty( $upload['error'] ) ) {
 			/* translators: 1: File name, 2: Error message. */
-			$errorString = sprintf( __( 'Could not write file %1$s (%2$s).' ), $name, $upload['error'] );
+			$error_string = sprintf( __( 'Could not write file %1$s (%2$s).' ), $name, $upload['error'] );
-			return new IXR_Error( 500, $errorString );
+			return new IXR_Error( 500, $error_string );
 		}
 		// Construct the attachment array.
 		$post_id = 0;
 		if ( ! empty( $data['post_id'] ) ) {
 			$post_id = (int) $data['post_id'];
 			if ( ! current_user_can( 'edit_post', $post_id ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 			}
 		}
 		$attachment = array(
 			'post_title'     => $name,
 			'post_content'   => '',
 			'post_type'      => 'attachment',
 			'post_parent'    => $post_id,
 			'post_mime_type' => $type,
 			'guid'           => $upload['url'],
 		);
 		// Save the data.
-		$id = wp_insert_attachment( $attachment, $upload['file'], $post_id );
+		$attachment_id = wp_insert_attachment( $attachment, $upload['file'], $post_id );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $upload['file'] ) );
 		/**
 		 * Fires after a new attachment has been added via the XML-RPC MovableType API.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param int   $id   ID of the new attachment.
+		 * @param int   $attachment_id ID of the new attachment.
-		 * @param array $args An array of arguments to add the attachment.
+		 * @param array $args          An array of arguments to add the attachment.
 		 */
-		do_action( 'xmlrpc_call_success_mw_newMediaObject', $id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+		do_action( 'xmlrpc_call_success_mw_newMediaObject', $attachment_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
-		$struct = $this->_prepare_media_item( get_post( $id ) );
+		$struct = $this->_prepare_media_item( get_post( $attachment_id ) );
 		// Deprecated values.
 		$struct['id']   = $struct['attachment_id'];
 		$struct['file'] = $struct['title'];
 		$struct['url']  = $struct['link'];
 		do_action( 'xmlrpc_call', 'mt.getRecentPostTitles', $args, $this );
 		$posts_list = wp_get_recent_posts( $query );
 		if ( ! $posts_list ) {
-			$this->error = new IXR_Error( 500, __( 'Either there are no posts, or something went wrong.' ) );
+			$this->error = new IXR_Error( 500, __( 'No posts found or an error occurred while retrieving posts.' ) );
 			return $this->error;
 		}
 		$recent_posts = array();
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getPostCategories', $args, $this );
 		$categories = array();
-		$catids     = wp_get_post_categories( (int) $post_id );
+		$cat_ids    = wp_get_post_categories( (int) $post_id );
 		// First listed category will be the primary category.
-		$isPrimary = true;
+		$is_primary = true;
-		foreach ( $catids as $catid ) {
+		foreach ( $cat_ids as $cat_id ) {
 			$categories[] = array(
-				'categoryName' => get_cat_name( $catid ),
+				'categoryName' => get_cat_name( $cat_id ),
-				'categoryId'   => (string) $catid,
+				'categoryId'   => (string) $cat_id,
-				'isPrimary'    => $isPrimary,
+				'isPrimary'    => $is_primary,
 			);
-			$isPrimary    = false;
+			$is_primary   = false;
 		}
 		return $categories;
 	}
 		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
-		$catids = array();
+		$cat_ids = array();
 		foreach ( $categories as $cat ) {
-			$catids[] = $cat['categoryId'];
+			$cat_ids[] = $cat['categoryId'];
 		}
-		wp_set_post_categories( $post_id, $catids );
+		wp_set_post_categories( $post_id, $cat_ids );
 		return true;
 	}
 	/**
 		 * FIXME: Does url_to_postid() cover all these cases already?
 		 * If so, then let's use it and drop the old code.
 		 */
 		$urltest = parse_url( $pagelinkedto );
 		$post_id = url_to_postid( $pagelinkedto );
 		if ( $post_id ) {
 			// $way
 		} elseif ( isset( $urltest['path'] ) && preg_match( '#p/[0-9]{1,}#', $urltest['path'], $match ) ) {
 			// The path defines the post_ID (archives/p/XXXX).
 			$blah    = explode( '/', $match[0] );
 			}
 		} else {
 			// TODO: Attempt to extract a post ID from the given URL.
 			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) );
 		}
 		$post_id = (int) $post_id;
+		$post    = get_post( $post_id );
-		$post = get_post( $post_id );
 		if ( ! $post ) { // Post not found.
 			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) );
 		}
-		if ( url_to_postid( $pagelinkedfrom ) == $post_id ) {
+		if ( url_to_postid( $pagelinkedfrom ) === $post_id ) {
 			return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );
 		}
 		// Check if pings are on.
 		if ( ! pings_open( $post ) ) {

changeset 22	8c2e4d02f4ef
parent 21	48c4eec2b7e6