[5.1] upmerge 2024-01-17 #42667
Merged
[5.1] upmerge 2024-01-17 #42667
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
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
* Update SiteRouter.php - check $force_ssl non type safe ### Summary of Changes When updateing joomla from joomla 3 to joomla 4.4 the value in cofiguration.php is still saved with `public $force_ssl = '2'` instead of `public $force_ssl = 2`. If set as string, the force_ssl setting has no effect, the redirection to https is not working. Furthermore, the cli command '/cli/joomla.php config:set force_ssl=2' also sets the configuration.php to `public $force_ssl = '2'`. The change should have no further effect, everywhere else in the code force_ssl is checked non type-safe. ### Testing Instructions Joomla 4.4.1 Run '/cli/joomla.php config:set force_ssl=2' and you will get `public $force_ssl = '2';` in configuration.php ### Actual result BEFORE applying this Pull Request redirection to https is not wotking, site loads with http://... ### Expected result AFTER applying this Pull Request Force SSL ist working, when opening with http://... the site is redirected to https://... ### Link to documentations Please select: - [ ] Documentation link for docs.joomla.org: <link> - [x] No documentation changes for docs.joomla.org needed - [ ] Pull Request link for manual.joomla.org: <link> - [x] No documentation changes for manual.joomla.org needed * Update libraries/src/Router/SiteRouter.php Co-authored-by: Richard Fath <richard67@users.noreply.github.com> ---------
…ents (joomla#42588) * Implement the ability to have 'separator' lines between sub menu items of a component in the Components menu of the Admin area. * Add ability to provide alias value to support multiple sub menu separators. ---------
Co-authored-by: Richard Fath <richard67@users.noreply.github.com> Co-authored-by: Quy <quy@nomonkeybiz.com>
* Remove "development status" of 5.0
joomla-cms-bot
added
NPM Resource Changed
4 tasks
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.
Pull Request for Issue # .
Summary of Changes
Testing Instructions
Actual result BEFORE applying this Pull Request
Expected result AFTER applying this Pull Request
Link to documentations
Please select:
Documentation link for docs.joomla.org:
No documentation changes for docs.joomla.org needed
Pull Request link for manual.joomla.org:
No documentation changes for manual.joomla.org needed