| @@ -18,11 +18,13 @@ | ||
| 18 | 18 | use Parsely\Metadata\Page_For_Posts_Builder; |
| 19 | 19 | use Parsely\Metadata\Paginated_Front_Page_Builder; |
| 20 | 20 | use Parsely\Metadata\Post_Builder; |
| 21 | 21 | use Parsely\Metadata\Tag_Builder; |
| 22 | -use Parsely\Utils\Utils; | |
| 23 | 22 | use WP_Post; |
| 24 | 23 | |
| 24 | +use function Parsely\Utils\get_page_for_posts; | |
| 25 | +use function Parsely\Utils\get_page_on_front; | |
| 26 | + | |
| 25 | 27 | /** |
| 26 | 28 | * Generates and inserts metadata readable by the Parse.ly Crawler. |
| 27 | 29 | * |
| 28 | 30 | * @since 1.0.0 |
| @@ -82,11 +84,12 @@ | ||
| 82 | 84 | /** |
| 83 | 85 | * Creates Parse.ly metadata object from post metadata. |
| 84 | 86 | * |
| 85 | 87 | * @param WP_Post $post object. |
| 88 | + * | |
| 86 | 89 | * @return Metadata_Attributes |
| 87 | 90 | */ |
| 88 | - public function construct_metadata( WP_Post $post ): array { | |
| 91 | + public function construct_metadata( WP_Post $post ) { | |
| 89 | 92 | $options = $this->parsely->get_options(); |
| 90 | 93 | $queried_object_id = get_queried_object_id(); |
| 91 | 94 | |
| 92 | 95 | if ( is_front_page() ) { |
| @@ -94,14 +97,14 @@ | ||
| 94 | 97 | $builder = new Front_Page_Builder( $this->parsely ); |
| 95 | 98 | } else { |
| 96 | 99 | $builder = new Paginated_Front_Page_Builder( $this->parsely ); |
| 97 | 100 | } |
| 98 | - } elseif ( 'page' === get_option( 'show_on_front' ) && ! Utils::get_page_on_front() ) { | |
| 101 | + } elseif ( 'page' === get_option( 'show_on_front' ) && ! get_page_on_front() ) { | |
| 99 | 102 | $builder = new Front_Page_Builder( $this->parsely ); |
| 100 | 103 | } elseif ( |
| 101 | 104 | is_home() && ( |
| 102 | - ! ( 'page' === get_option( 'show_on_front' ) && ! Utils::get_page_on_front() ) || | |
| 103 | - Utils::get_page_for_posts() === $queried_object_id | |
| 105 | + ! ( 'page' === get_option( 'show_on_front' ) && ! get_page_on_front() ) || | |
| 106 | + get_page_for_posts() === $queried_object_id | |
| 104 | 107 | ) |
| 105 | 108 | ) { |
| 106 | 109 | $builder = new Page_For_Posts_Builder( $this->parsely ); |
| 107 | 110 | } elseif ( is_author() ) { |
| @@ -118,24 +121,25 @@ | ||
| 118 | 121 | $builder = new Page_Builder( $this->parsely, $post ); |
| 119 | 122 | } |
| 120 | 123 | |
| 121 | 124 | if ( isset( $builder ) ) { |
| 122 | - $current_metadata = $builder->get_metadata(); | |
| 125 | + $parsely_page = $builder->get_metadata(); | |
| 123 | 126 | } else { |
| 124 | - $current_metadata = array(); | |
| 127 | + $parsely_page = array(); | |
| 125 | 128 | } |
| 126 | 129 | |
| 127 | 130 | /** |
| 128 | 131 | * Filters the structured metadata. |
| 129 | 132 | * |
| 130 | - * @since 2.5.0 | |
| 131 | 133 | * @var mixed |
| 132 | 134 | * |
| 133 | - * @param array $current_metadata The currently generated metadata. | |
| 135 | + * @param array $parsely_page Existing structured metadata for a page. | |
| 134 | 136 | * @param WP_Post $post Post object. |
| 135 | 137 | * @param array $options The Parse.ly options. |
| 138 | + * | |
| 139 | + * @since 2.5.0 | |
| 136 | 140 | */ |
| 137 | - $filtered = apply_filters( 'wp_parsely_metadata', $current_metadata, $post, $options ); | |
| 141 | + $filtered = apply_filters( 'wp_parsely_metadata', $parsely_page, $post, $options ); | |
| 138 | 142 | if ( is_array( $filtered ) ) { |
| 139 | 143 | return $filtered; |
| 140 | 144 | } |
| 141 | 145 | |