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

Try Catch for embeded media - Backport to 4.6 #9600

Merged
merged 1 commit into from
Jul 17, 2020
Merged

Try Catch for embeded media - Backport to 4.6 #9600

merged 1 commit into from
Jul 17, 2020

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Jul 17, 2020 •
edited
Loading

Issue #9601

Backport of 3bf89b2

@rdigitalg @emteknetnz
FIX Try Catch for embeded media (silverstripe#9424)
56f15b1 
* Try Catch for embeded media
* added missing namespaces, translatable message INVALID_URL
* generate tag only once
* catch after closing bracket
* space after comma
* Update src/View/Shortcodes/EmbedShortcodeProvider.php
* Linting
Co-authored-by: [email protected] <[email protected]>
Co-authored-by: Steve Boyd <[email protected]>
Co-authored-by: Loz Calver <[email protected]>
This was referenced Jul 17, 2020
Closed
Merged
kinglozzer
kinglozzer approved these changes Jul 17, 2020
View reviewed changes
Copy link
Member

@kinglozzer kinglozzer left a comment

Choose a reason for hiding this comment

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

As this is a bug fix for a potentially site-breaking issue, no objects to backporting it from me

@ScopeyNZ
Copy link
Contributor

I've just cherried stuff like this in the past without a PR 😅

@ScopeyNZ ScopeyNZ merged commit 8720043 into silverstripe:4.6 Jul 17, 2020
@brynwhyman
Copy link
Contributor

Thanks guys :)

@camfindlay
Copy link
Contributor

Does this mean this issue is fixed in 4.6.0 or a pending 4.6.1 release?

@emteknetnz
Copy link
Member Author

emteknetnz commented Jul 22, 2020 •
edited
Loading

@camfindlay pending 4.6.1 release

You can optionally use this straight away if you pin the merge commit in your composer.json, though not being an official release it means it hasn't gone through our full regression suite. i.e. (apologies if I have the syntax wrong)

"silverstripe/framework": "4.6.x-dev#87200439be8bdc88c1182aa47356c26b5920bee4"

(and remember to unpin it once 4.6.1 is released :)

@camfindlay
Copy link
Contributor

Thanks @emteknetnz eta on 4.6.1?

@emteknetnz
Copy link
Member Author

@camfindlay We've had interest from a few different parties regarding this particular fix, so we've just tagged 4.6.1 now

https://github.com/silverstripe/silverstripe-framework/releases/tag/4.6.1

@christopherdarling
Copy link
Contributor

@camfindlay We've had interest from a few different parties regarding this particular fix, so we've just tagged 4.6.1 now

https://github.com/silverstripe/silverstripe-framework/releases/tag/4.6.1

Any chance of 4.6.1 recipe releases too?

@ScopeyNZ
Copy link
Contributor

It's a bit more of an ordeal to do a full recipe release, but if you want you can "unpack"/inline a recipe into your composer.json by using composer require-recipe.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kinglozzer kinglozzer kinglozzer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@emteknetnz @ScopeyNZ @brynwhyman @camfindlay @christopherdarling @kinglozzer @rdigitalg