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

Jump to bottom

[CIVIC-1521] Fixed issue #1147: catch InvalidArgumentException in civictheme_url_is_external #1167

Merged
merged 1 commit into from
Dec 7, 2023
Merged

[CIVIC-1521] Fixed issue #1147: catch InvalidArgumentException in civictheme_url_is_external #1167

merged 1 commit into from
Dec 7, 2023

Conversation

sonnykt
Copy link
Collaborator

@sonnykt sonnykt commented Dec 7, 2023

Issue: https://github.com/salsadigitalauorg/civictheme_source/issues/1147

Checklist before requesting a review

  • I have formatted the subject to include ticket number as [CS-123] Verb in past tense with dot at the end.
  • I have added a link to the issue tracker
  • I have provided information in Changed section about WHY something was done if this was not a normal implementation
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works
  • I have run new and existing relevant tests locally with my changes, and they passed
  • I have provided screenshots, where applicable

Changed

  1. Catch InvalidArgumentException in civictheme_url_is_external().

Screenshots

@sonnykt sonnykt added the State: Needs review Pull requests needs a review from assigned developers label Dec 7, 2023
@sonnykt sonnykt self-assigned this Dec 7, 2023
AlexSkrypnyk
AlexSkrypnyk reviewed Dec 7, 2023
View reviewed changes
web/themes/contrib/civictheme/includes/utilities.inc Outdated
if (!UrlHelper::isValid($override_domain, TRUE)) {
continue;
}
if (!UrlHelper::isValid($override_domain, TRUE)) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

@sonnykt
can we use civictheme_url_is_valid() here as well so that we rely on the valid URL check in a single place?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@AlexSkrypnyk done

AlexSkrypnyk
AlexSkrypnyk approved these changes Dec 7, 2023
View reviewed changes
Copy link
Collaborator

@AlexSkrypnyk AlexSkrypnyk left a comment

Choose a reason for hiding this comment

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

@sonnykt thank you for your contribution

@AlexSkrypnyk AlexSkrypnyk merged commit 4d9237e into develop Dec 7, 2023
10 checks passed
@AlexSkrypnyk AlexSkrypnyk deleted the feature/CIVIC-1521 branch December 7, 2023 04:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexSkrypnyk AlexSkrypnyk AlexSkrypnyk approved these changes

Assignees

@sonnykt sonnykt

Labels
State: Needs review Pull requests needs a review from assigned developers
Projects
None yet
Milestone
No milestone
2 participants
@sonnykt @AlexSkrypnyk