3.8.9 Merge part 2 #23379
Merged
3.8.9 Merge part 2 #23379
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [fix] Error decoding JSON data: Syntax error * [test] ensure that empty params do not cause user loading issues
* Don't try to json_decode() a null value * Add Registry package fix to make sure broken code can continue to work
A constructor can't return a value.
* PHPCS2 manual changes - Doc comment for parameter does not match actual variable name - Comment closer must be on a new line (just convert to single line comment) - be more specific with the rules we want to exclude * fix spaces Expected only 2 spaces after the longest variable name * one more fix for doc comment - Doc comment for parameter does not match actual variable name
* Feed links * Restore http check for now * CS * Some cleanups
* Verb wrong tense Clearly using the present tense is incorrect for an error message and it should be the past tense * no error
…ting global configuration (joomla#20590) * Fix stale session data wrongly overriding configuration file when editing global configuration * Use $this variable
* Singular not plural Obvious correction. sorry I dont know what I did to display the error. * Update en-GB.mod_sampledata.ini
|
@wilsonge any reason that you dropped this PR from the milestone? |
|
I’ve not been putting the merging of j3 code in under the milestones. Because it just won’t make sense for people viewing the changelog |
|
Ah get the point 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
QED
Don't squash merge. Merge with a merge commit