revert return to false, return filtered null

Author: DavidCramer

php/class-delivery.php

@@ -118,7 +118,7 @@ public function add_post_id( $content ) {
 	 * @return int|null
 	 */
 	public function get_current_post_id() {
-		return $this->current_post_id;
+		return $this->current_post_id ? $this->current_post_id : null;
 	}
 
 	/**

php/media/class-filter.php

@@ -92,10 +92,10 @@ public function get_video_shortcodes( $html ) {
 	 *
 	 * @param string $asset The media tag.
 	 * @param string $type  The type.
-	 * @return int|null
+	 * @return int|false
 	 */
 	public function get_id_from_tag( $asset, $type = 'wp-image-|wp-video-' ) {
-		$attachment_id = null;
+		$attachment_id = false;
 		// Get attachment id from class name.
 		if ( preg_match( '#class=["|\']?[^"\']*(' . $type . ')([\d]+)[^"\']*["|\']?#i', $asset, $found ) ) {
 			$attachment_id = intval( $found[2] );