Skip to content
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.

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

Remove o2_Fragment::o2_make_clickable() to prevent stripping oEmbed tags. #218

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
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
32 changes: 1 addition & 31 deletions inc/fragment.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,7 @@ public static function get_fragment_from_post( $my_post, $args = array() ) {
} elseif ( isset( $args['the_content'] ) ) {
$filtered_content = make_clickable( $args['the_content'] );
} else {
add_filter( 'the_content', 'o2_Fragment::o2_make_clickable', 9 );
$filtered_content = apply_filters( 'the_content', $extended_content );
remove_filter( 'the_content', 'o2_Fragment::o2_make_clickable', 9 );
$filtered_content = make_clickable( apply_filters( 'the_content', $extended_content ) );
}
$filtered_content = apply_filters( 'o2_filtered_content', $filtered_content, $my_post );

Expand Down Expand Up @@ -729,32 +727,4 @@ public static function home_url( $url, $path, $orig_scheme, $blog_id ) {

return $url;
}

public static function o2_make_clickable( $content ) {
// make urls clickable, but exclude text within square brackets - we don't want make_clickable
// processing between brackets because it messes up not-yet-filtered shortcodes that have url
// attributes like googlemaps

$regex = '/(\[[^\]]*])/i';

$placeholders = $matches = array();

while ( preg_match( $regex, $content, $matches ) ) {
do {
$hash = wp_generate_password( 36, false );
} while( array_key_exists( $hash, $placeholders ) );
$placeholder = ":: o2-make-clickable-placeholder $hash ::";
$placeholders[ $hash ] = $matches[0];
$content = preg_replace( $regex, $placeholder, $content, 1 );
}

$content = make_clickable( $content );

foreach ( $placeholders as $hash => $original ) {
$placeholder = ":: o2-make-clickable-placeholder $hash ::";
$content = str_replace( $placeholder, $original, $content );
}

return wp_kses_post( $content );
}
}