Skip to content

Revert "Fixed cover layout issue with CPT" #4314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vytisbulkevicius merged 1 commit into from
Oct 28, 2024
Merged

Revert "Fixed cover layout issue with CPT" #4314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions e2e-tests/specs/customizer/layout/single-post-settings.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ test.describe('Single Post Check', function () {
baseURL,
});
const HIDDEN = [
'.entry-header',
'.nv-thumb-wrap',
'.entry-content',
'.nv-tags-list',
Expand Down
5 changes: 1 addition & 4 deletions inc/customizer/defaults/single_post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ public function get_cpt_context( $allowed = [ 'post', 'page' ] ) {
*/
$allowed_context = apply_filters( 'neve_allowed_custom_post_types', $allowed, 10, 1 );
$context = get_post_type();
if ( ! has_filter( 'neve_context_filter' ) && ! in_array( get_post_type(), $allowed_context, true ) ) {
$context = 'post';
}
$context = apply_filters( 'neve_context_filter', $context, 10, 1 );
$context = apply_filters( 'neve_context_filter', $context, 10, 1 );

return [ $context, $allowed_context ];
}
Expand Down
2 changes: 1 addition & 1 deletion inc/customizer/options/layout_single_page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ public function add_controls() {
* @return bool
*/
public static function is_cover_layout() {
return class_exists( '\Neve_Pro\Admin\Custom_Layouts_Cpt' ) && get_theme_mod( 'neve_page_header_layout' ) === 'cover';
return get_theme_mod( 'neve_page_header_layout' ) === 'cover';
}
}
2 changes: 1 addition & 1 deletion inc/customizer/options/layout_single_post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ public function sanitize_post_elements_ordering( $value ) {
* @return bool
*/
public static function is_cover_layout() {
return class_exists( '\Neve_Pro\Admin\Custom_Layouts_Cpt' ) && get_theme_mod( 'neve_post_header_layout' ) === 'cover';
return get_theme_mod( 'neve_post_header_layout' ) === 'cover';
}

/**
Expand Down
4 changes: 0 additions & 4 deletions inc/views/cover_header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ public function render_cover_header() {
return;
}

if ( ! class_exists( '\Neve_Pro\Admin\Custom_Layouts_Cpt' ) && get_post_type() !== $context ) {
return;
}

$header_layout = get_theme_mod( 'neve_' . $context . '_header_layout', 'normal' );
if ( $header_layout !== 'cover' ) {
return;
Expand Down
5 changes: 0 additions & 5 deletions inc/views/post_layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,6 @@ private function get_content_order() {
}
}

list( $context ) = $this->get_cpt_context();
if ( ! Layout_Single_Post::is_cover_layout() && get_post_type() !== $context ) {
$content_order = array_unique( array_merge( array( 'title-meta' ), $content_order ) );
}

return apply_filters( 'neve_layout_single_post_elements_order', $content_order );
}
}
Loading