Skip to content

fix: Deprecated: preg_replace(): Passing null to parameter #3 ($subject) o… #421

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
merged 2 commits into from
Nov 10, 2024
Merged

fix: Deprecated: preg_replace(): Passing null to parameter #3 ($subject) o… #421

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6166592
Deprecated: preg_replace(): Passing null to parameter #3 ($subject) o…
nikkii94 Oct 31, 2024
05d97df
Merge remote-tracking branch 'origin/master' into preg_replace_deprec…
ezyang Nov 10, 2024
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
4 changes: 2 additions & 2 deletions library/HTMLPurifier/Filter/YouTube.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function preFilter($html, $config, $context)
$pre_regex = '#<object[^>]+>.+?' .
'(?:http:)?//www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
$pre_replace = '<span class="youtube-embed">\1</span>';
return preg_replace($pre_regex, $pre_replace, $html);
return preg_replace($pre_regex, $pre_replace, (string)$html);
}

/**
Expand All @@ -31,7 +31,7 @@ public function preFilter($html, $config, $context)
public function postFilter($html, $config, $context)
{
$post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), (string)$html);
}

/**
Expand Down
Loading