Merge pull request #82 from Liblastic/preview-fix

Preview fix

Author: Nomafin

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.16.2] - 2018-09-03
+
+### Changed
+- Fixed 'dustpress/router' filter for WordPress preview functionality.
+- Removed unnecessary `$id` parameter from `get_post_meta()`.
+- Changed functions `get_post()` and `get_acf_post()` to use global post if desired post id same as global post.
+
 ## [1.16.1] - 2018-06-20
 
 ### Added

classes/query.php

@@ -34,7 +34,10 @@ class Query {
 	 *
      * @return array|object|null Type corresponding to output type on success or null on failure.
 	 */
-	public static function get_post( $id, $args = array() ) {
+	public static function get_post( $id = null, $args = array() ) {
+
+		global $post;
+
 		$defaults = [
 			'meta_keys' => 'null',
 			'single' 	=> false,
@@ -45,20 +48,23 @@ public static function get_post( $id, $args = array() ) {
 
 		extract( $options );
 
-		$post_data = get_post( $id, 'ARRAY_A' );
+		// If id is not the same as global post get_post by id.
+		if ( $post->ID !== $id ) {
+			$post = get_post( $id );
+		}
 
-		if ( is_array( $post_data ) ) {
-			self::get_post_meta( $post_data, $post_data['ID'], $meta_keys, $single );
+		if ( is_object( $post ) ) {
+			self::get_post_meta( $post, $meta_keys, $single );
 		} else {
 		    // Return null.
-		    return $post_data;
+		    return $post;
         }
 
-		$post_data['permalink'] = get_permalink( $id );
-		$post_data['image_id']  = get_post_thumbnail_id( $id );
+		$post->permalink = get_permalink( $post->ID );
+		$post->image_id  = get_post_thumbnail_id( $post->ID );
 
 		// Cast the post and return.
-		return self::cast_post_to_type( $post_data, $output );
+		return self::cast_post_to_type( $post, $output );
 	}
 
 	/**
@@ -77,7 +83,9 @@ public static function get_post( $id, $args = array() ) {
 	 *
      * @return array|object|null Type corresponding to output type on success or null on failure.
 	 */
-	public static function get_acf_post( $id, $args = array() ) {
+	public static function get_acf_post( $id = null, $args = array() ) {
+
+		global $post;
 
 		$defaults = [
 			'meta_keys' 				=> null,
@@ -92,39 +100,45 @@ public static function get_acf_post( $id, $args = array() ) {
 
 		extract( $options );
 
-		$acfpost = get_post( $id, 'ARRAY_A' );
+		if ( $post->ID !== $id ) {
+			$acfpost = get_post( $id );
+		} else {
+			$acfpost = $post;
+		}
 
-		if ( is_array( $acfpost ) ) {
-			$acfpost['fields'] = get_fields( $id );
+		if ( is_object( $acfpost ) ) {
+			$acfpost->fields = get_fields( $post->ID );
 
 			// Get fields with relational post data as a whole acf object
 			if ( $current_recursion_level < $max_recursion_level ) {
 
 				// Let's avoid infinite loops by default by stopping recursion after one level. You may dig deeper in your view model.
 				$options['current_recursion_level'] = apply_filters( 'dustpress/query/current_recursion_level', ++$current_recursion_level );
 
-				if ( is_array( $acfpost['fields'] ) && count( $acfpost['fields'] ) > 0 ) {
-					foreach ( $acfpost['fields'] as &$field ) {
+				if ( is_object( $acfpost->fields ) && count( $acfpost->fields ) > 0 ) {
+					foreach ( $acfpost->fields as &$field ) {
 						$field = self::handle_field( $field, $options );
 					}
 				}
 			} elseif ( true == $whole_fields ) {
-				if ( is_array( $acfpost['fields'] ) && count( $acfpost['fields'] ) > 0 ) {
-					foreach( $acfpost['fields'] as $name => &$field ) {
-						$field = get_field_object($name, $id, true);
+				if ( is_object( $acfpost->fields ) && count( $acfpost->fields ) > 0 ) {
+					foreach( $acfpost->fields as $name => &$field ) {
+						$field = get_field_object( $name, $post->ID, true );
 					}
 				}
 			}
-			self::get_post_meta( $acfpost, $id, $meta_keys, $single );
+
+			self::get_post_meta( $acfpost, $meta_keys, $single );
 		}
 
-		$acfpost['permalink'] = get_permalink( $id );
+		$acfpost->permalink = get_permalink( $post->ID );
 
-		if ( function_exists("acf_get_attachment") ) {
-			$attachment_id = get_post_thumbnail_id( $id );
+		// Get ACF image object.
+		if ( function_exists( 'acf_get_attachment' ) ) {
+			$attachment_id = get_post_thumbnail_id( $post->ID );
 
 			if ( $attachment_id ) {
-				$acfpost['image'] = acf_get_attachment( $attachment_id );
+				$acfpost->image = acf_get_attachment( $attachment_id );
 			}
 		}
 
@@ -370,26 +384,26 @@ private static function parse_query_object( $query ) {
 	 * @since	0.0.1
 	 *
 	 * @param  array		&$post    	The queried post.
-	 * @param  int 			$id        	Id for the post.
 	 * @param  array/string $meta_keys 	Wanted meta keys or string 'ALL' to fetch all.
 	 * @param  boolean 		$single 	If true, return only the first value of the specified meta_key.
      *
 	 * @return array
 	 */
-    private static function get_post_meta( &$post, $id, $meta_keys = NULL, $single ) {
+    private static function get_post_meta( &$post, $meta_keys = NULL, $single = false ) {
+
 		$meta = array();
 
 		if ( $meta_keys === 'all' ) {
 		    // Get all metadata.
-			$meta = get_metadata( 'post', $id, '', $single );
+			$meta = get_metadata( 'post', $post->ID, '', $single );
 		} elseif ( is_array( $meta_keys ) ) {
 		    // Get the wanted metadata by defined keys.
 			foreach ( $meta_keys as $key ) {
-				$meta[$key] = get_metadata( 'post', $id, $key, $single );
+				$meta[$key] = get_metadata( 'post', $post->ID, $key, $single );
 			}
 		}
 
-		$post['meta'] = $meta;
+		$post->meta = $meta;
 	}
 
 	/**
@@ -428,6 +442,7 @@ private static function get_meta_for_posts( &$posts = [], $meta_keys = NULL, $si
 
 	/**
 	 * Used to cast posts to a desired type.
+	 * Defaults to standard WordPress object.
 	 *
 	 * @type	function
 	 * @date	26/1/2016
@@ -440,13 +455,12 @@ private static function get_meta_for_posts( &$posts = [], $meta_keys = NULL, $si
 	 */
 	private static function cast_post_to_type( $post, $type ) {
 
-        if ( 'OBJECT' === $type ) {
-            return (object) $post;
-        } elseif ( 'ARRAY_N' === $type ) {
-            return array_values( $post );
+		if ( $type === 'ARRAY_A' ) {
+			$post = $post->to_array();
+		} elseif ( $type === 'ARRAY_N' ) {
+            $post = array_values( $post->to_array() );
         }
 
-        // Defaults to ARRAY_A
 		return $post;
 	}
 

dustpress.php

@@ -6,7 +6,7 @@
 Author: Miika Arponen & Ville Siltala / Geniem Oy
 Author URI: http://www.geniem.com
 License: GPLv3
-Version: 1.16.1
+Version: 1.16.2
 */
 
 final class DustPress {
@@ -194,8 +194,8 @@ public function create_instance() {
             // Filter for wanted post ID
             $new_post = apply_filters( 'dustpress/router', $post_id );
 
-            // If developer wanted a post ID, make it happen
-            if ( ! is_null( $new_post ) ) {
+            // If developer wanted a post by post ID.
+            if ( $new_post !== $post_id ) {
                 $post = get_post( $new_post );
 
                 setup_postdata( $post );