Skip to content

Instantly share code, notes, and snippets.

@lkraav

lkraav/embedded-managed-wpv_template.diff

Created October 25, 2018 15:14
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save lkraav/fab7116a5e04927572f20d9825c19e1e to your computer and use it in GitHub Desktop.
Save lkraav/fab7116a5e04927572f20d9825c19e1e to your computer and use it in GitHub Desktop.
Download ZIP
Raw
embedded-managed-wpv_template.diff
diff --git a/embedded/inc/views-templates/wpv-template.class.php b/embedded/inc/views-templates/wpv-template.class.php
index 62586ce..52c2ea4 100644
--- a/embedded/inc/views-templates/wpv-template.class.php
+++ b/embedded/inc/views-templates/wpv-template.class.php
@@ -8,6 +8,11 @@ class WPV_template{
^M
$this->wpautop_removed = false;^M
^M
+ /**^M
+ * Tracks which `remove_filter()` call succeeded, and should be restored later.^M
+ */^M
+ $this->remove_filter = [];^M
+^M
$this->view_template_used_ids = array();^M
}^M
^M
@@ -914,34 +919,48 @@ class WPV_template{
}^M
^M
function remove_wpautop() {^M
- remove_filter('the_content', 'wpautop');^M
- remove_filter('the_content', 'shortcode_unautop');^M
+ $this->remove_filter['the_content']['wpautop'] = remove_filter('the_content', 'wpautop');^M
+ $this->remove_filter['the_content']['shortcode_unautop'] = remove_filter('the_content', 'shortcode_unautop');^M
// Remove the autop behavior introduced by Gutenberg when the content does not contain blocks.^M
// The relevant filter is documented in gutenberg/lib/compat.php^M
- if ( function_exists( 'gutenberg_wpautop' ) ) {^M
- remove_filter( 'the_content', 'gutenberg_wpautop', 8 );^M
+ if ( function_exists( 'gutenberg_wpautop' ) ) {^M
+ $this->remove_filter['the_content']['gutenberg_wpautop'][5] = remove_filter( 'the_content', 'gutenberg_wpautop', 5 );^M
}^M
- remove_filter( 'wpv_filter_wpv_the_content_suppressed', 'wpautop' );^M
- remove_filter( 'wpv_filter_wpv_the_content_suppressed', 'shortcode_unautop' );^M
- remove_filter('the_excerpt', 'wpautop');^M
- remove_filter('the_excerpt', 'shortcode_unautop');^M
+ $this->remove_filter['wpv_filter_wpv_the_content_suppressed']['wpautop'] = remove_filter( 'wpv_filter_wpv_the_content_suppressed', 'wpautop' );^M
+ $this->remove_filter['wpv_filter_wpv_the_content_suppressed']['shortcode_unautop'] = remove_filter( 'wpv_filter_wpv_the_content_suppressed', 'shortcode_unautop' );^M
+ $this->remove_filter['the_excerpt']['wpautop'] = remove_filter( 'the_excerpt', 'wpautop' );^M
+ $this->remove_filter['the_excerpt']['shortcode_unautop'] = remove_filter( 'the_excerpt', 'shortcode_unautop' );^M
^M
$this->wpautop_removed = true;^M
}^M
^M
function restore_wpautop( $content ) {^M
- if ( $this->wpautop_removed ) {^M
- add_filter('the_content', 'wpautop');^M
- add_filter('the_content', 'shortcode_unautop');^M
+ if ( $this->wpautop_removed && ! empty( $this->remove_filter ) ) {^M
+ if ( isset( $this->remove_filter['the_content']['wpautop'] ) && $this->remove_filter['the_content']['wpautop'] ) {^M
+ add_filter('the_content', 'wpautop');^M
+ }^M
+ if ( isset( $this->remove_filter['the_content']['shortcode_unautop'] ) && $this->remove_filter['the_content']['shortcode_unautop'] ) {^M
+ add_filter('the_content', 'shortcode_unautop');^M
+ }^M
// Restore the autop behavior introduced by Gutenberg when the content does not contain blocks.^M
// The relevant filter is documented in gutenberg/lib/compat.php^M
if ( function_exists( 'gutenberg_wpautop' ) ) {^M
- add_filter( 'the_content', 'gutenberg_wpautop', 8 );^M
+ if ( isset( $this->remove_filter['the_content']['gutenberg_wpautop'][5] ) && $this->remove_filter['the_content']['gutenberg_wpautop'][5] ) {^M
+ add_filter('the_content', 'gutenberg_wpautop', 5);^M
+ }^M
+ }^M
+ if ( isset( $this->remove_filter['wpv_filter_wpv_the_content_suppressed']['wpautop'] ) && $this->remove_filter['wpv_filter_wpv_the_content_suppressed']['wpautop'] ) {^M
+ add_filter('wpv_filter_wpv_the_content_suppressed', 'wpautop');^M
+ }^M
+ if ( isset( $this->remove_filter['wpv_filter_wpv_the_content_suppressed']['shortcode_unautop'] ) && $this->remove_filter['wpv_filter_wpv_the_content_suppressed']['shortcode_unautop'] ) {^M
+ add_filter('wpv_filter_wpv_the_content_suppressed', 'shortcode_unautop');^M
+ }^M
+ if ( isset( $this->remove_filter['the_excerpt']['wpautop'] ) && $this->remove_filter['the_excerpt']['wpautop'] ) {^M
+ add_filter('the_excerpt', 'wpautop');^M
+ }^M
+ if ( isset( $this->remove_filter['the_excerpt']['shortcode_unautop'] ) && $this->remove_filter['the_excerpt']['shortcode_unautop'] ) {^M
+ add_filter('the_excerpt', 'shortcode_unautop');^M
}^M
- add_filter( 'wpv_filter_wpv_the_content_suppressed', 'wpautop' );^M
- add_filter( 'wpv_filter_wpv_the_content_suppressed', 'shortcode_unautop' );^M
- add_filter('the_excerpt', 'wpautop');^M
- add_filter('the_excerpt', 'shortcode_unautop');^M
$this->wpautop_removed = false;^M
}^M
^M
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment