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

Upgrade Shortcodes to 1.0.0 #7988

Merged
merged 4 commits into from
Dec 15, 2020
Merged

Upgrade Shortcodes to 1.0.0 #7988

merged 4 commits into from
Dec 15, 2020

Conversation

hishamco
Copy link
Member

@hishamco hishamco commented Dec 14, 2020 •
edited
Loading

Fixes #7986 #7715

@agriffard
Copy link
Member

Not so simple, the tests will fail.

@hishamco
Copy link
Member Author

hishamco commented Dec 14, 2020 •
edited
Loading

Not so simple, the tests will fail.

No worry I will try to fix them

@hishamco hishamco marked this pull request as draft December 14, 2020 14:18
@hishamco
Copy link
Member Author

Seems the only test that fails is locale shortcode, so I need to figure out if it's a shortcodes bug after the recent commits, because it was working before

@hishamco
Copy link
Member Author

Everything is working fine in Shortcodes, the issue occurs from LocaleShortcodeProvider.Null, problem solved

@Skrypt
Copy link
Contributor

Skrypt commented Dec 14, 2020

hmm yeah Null is probably a reserved word.

@hishamco hishamco marked this pull request as ready for review December 14, 2020 21:11
@hishamco hishamco removed the request for review from agriffard December 14, 2020 21:12
deanmarcussen
deanmarcussen reviewed Dec 15, 2020
View reviewed changes
Copy link
Member

@deanmarcussen deanmarcussen left a comment

Choose a reason for hiding this comment

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

The change in behaviour with shortcodes is to render the [blah] if it is not registered.

I assume (hope) that means somewhere it's evaluated against null for not registered, and empty for is registered, but didn't return a value.

Can you try with the suggested change to see if it passes, and if not we might have to look at shortcodes.

src/OrchardCore.Modules/OrchardCore.Shortcodes/Providers/LocaleShortcodeProvider.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Shortcodes/Providers/LocaleShortcodeProvider.cs Show resolved Hide resolved
@deanmarcussen
Copy link
Member

Fixes #7715

@hishamco hishamco merged commit 6834238 into dev Dec 15, 2020
@delete-merged-branch delete-merged-branch bot deleted the hishamco/shortcodes-upgrade branch December 15, 2020 17:33
@hishamco hishamco mentioned this pull request Dec 16, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deanmarcussen deanmarcussen deanmarcussen approved these changes

@jptissot jptissot Awaiting requested review from jptissot

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

Successfully merging this pull request may close these issues.

Shortcodes 1.0.0
4 participants
@hishamco @agriffard @Skrypt @deanmarcussen