Skip to content

[5.4] Upmerge 2025-06-20 #45632

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

Merged
muhme merged 5 commits into from
Jun 20, 2025
Merged

[5.4] Upmerge 2025-06-20 #45632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b8e1ae
[5.3] Disable opcache as it makes the SEF system test flaky (#45608)
laoneo Jun 17, 2025
61f4c77
[5.3] Remove Fields button for custom module (#45600)
brianteeman Jun 19, 2025
dfff995
[5.3] Copy/Paste error in comment. (#45625)
chmst Jun 19, 2025
5732560
[5.3] Login Module show password (#45626)
brianteeman Jun 20, 2025
5fef50e
Merge remote-tracking branch 'upstream/5.3-dev' into 5.4-dev-upmerge-…
richard67 Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_modules/forms/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
label="COM_MODULES_FIELD_CONTENT_LABEL"
buttons="true"
filter="\Joomla\CMS\Component\ComponentHelper::filterText"
hide="readmore,pagebreak,module"
hide="readmore,pagebreak,module,fields"
/>

<field
Expand Down
2 changes: 1 addition & 1 deletion components/com_config/forms/modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
label="COM_MODULES_FIELD_CONTENT_LABEL"
buttons="true"
filter="\Joomla\CMS\Component\ComponentHelper::filterText"
hide="readmore,pagebreak"
hide="readmore,pagebreak,module,fields"
/>

<field
Expand Down
8 changes: 7 additions & 1 deletion modules/mod_login/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@
</div>
<?php else : ?>
<label for="modlgn-passwd-<?php echo $module->id; ?>"><?php echo Text::_('JGLOBAL_PASSWORD'); ?></label>
<input id="modlgn-passwd-<?php echo $module->id; ?>" type="password" name="password" autocomplete="current-password" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_PASSWORD'); ?>">
<div class="input-group">
<input id="modlgn-passwd-<?php echo $module->id; ?>" type="password" name="password" autocomplete="current-password" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_PASSWORD'); ?>">
<button type="button" class="btn btn-secondary input-password-toggle">
<span class="icon-eye icon-fw" aria-hidden="true"></span>
<span class="visually-hidden"><?php echo Text::_('JSHOWPASSWORD'); ?></span>
</button>
</div>
<?php endif; ?>
</div>

Expand Down
2 changes: 1 addition & 1 deletion modules/mod_related_items/src/Dispatcher/Dispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// phpcs:enable PSR1.Files.SideEffects

/**
* Dispatcher class for mod_articles_popular
* Dispatcher class for mod_articles_related_items
*
* @since 4.4.0
*/
Expand Down
4 changes: 4 additions & 0 deletions tests/System/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ chown -R www-data /tests/www/$TEST_GROUP/
# Required for media manager tests
chmod -R 777 /tests/www/$TEST_GROUP/images

# Disable opcache for configuration.php, otherwise there are issues when the config is changed in a test
echo "/tests/www/$TEST_GROUP/configuration.php" > /tmp/blacklist.ini
echo "opcache.blacklist_filename=/tmp/blacklist.ini" >> /etc/php/*/apache2/conf.d/10-opcache.ini

echo "[RUNNER] Start Apache"
a2enmod rewrite
apache2ctl -D FOREGROUND &
Expand Down