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.

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

Fix notice and wrong Regex #781

Merged
merged 4 commits into from
Dec 10, 2024
+1 −1
Merged

Fix notice and wrong Regex #781

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e89f42
Fix
timotei-litespeed Nov 26, 2024
9c6485b
Update cdn.cls.php
timotei-litespeed Dec 9, 2024
9dc1633
Changed the rule
timotei-litespeed Dec 10, 2024
493ffcf
remove extra condition
timotei-litespeed Dec 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
6 changes: 5 additions & 1 deletion src/cdn.cls.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,12 @@ private function _replace_inline_css()
* @see #685485
* @since 3.0
*/
preg_match_all('/url\((?![\'"]?data)[\'"]?([^\)\'"\\\]+)[\'"]?\)/i', $this->content, $matches);
preg_match_all('/url\((?![\'"]?data)[\'"]?(.*?)[\'"]?\)/i', $this->content, $matches);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we change (.*?) to (.+?)? @timotei-litespeed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed, at least it will filter out empty url :)

foreach ($matches[1] as $k => $url) {
if ($url == null) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just use if (!$url) as empty case should be bypassed as well??

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, added the changed

continue;
}

$url = str_replace(array(' ', '\t', '\n', '\r', '\0', '\x0B', '"', "'", '"', '''), '', $url);

// Parse file postfix
Expand Down
Loading