Skip to content

5.1/upmerges/2024 03 28 #43172

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
bembelimen merged 6 commits into from
Mar 28, 2024
Merged

5.1/upmerges/2024 03 28 #43172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1aed565
update punycode library to include security fix (#43092)
SniperSister Mar 20, 2024
3db2bf3
CMSObject should extend stdClass (#43020)
laoneo Mar 20, 2024
0197d56
[4.x] Add support for brotli (#43055)
Razzo1987 Mar 21, 2024
8eefbf2
Allow to use filter.state for delete button in ListView (#38797)
HLeithner Mar 22, 2024
9d5b5a2
User profile edit: No notice when no active menu item (#43140)
Hackwar Mar 27, 2024
cd22b4d
Merge remote-tracking branch 'joomla/4.4-dev' into 5.1/upmerges/2024-…
LadySolveig Mar 28, 2024
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
9 changes: 5 additions & 4 deletions components/com_users/src/View/Profile/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,14 @@ public function display($tpl = null)
unset($this->data->text);

// Check for layout from menu item.
$query = Factory::getApplication()->getMenu()->getActive()->query;
$active = Factory::getApplication()->getMenu()->getActive();

if (
isset($query['layout']) && isset($query['option']) && $query['option'] === 'com_users'
&& isset($query['view']) && $query['view'] === 'profile'
$active && isset($active->query['layout'])
&& isset($active->query['option']) && $active->query['option'] === 'com_users'
&& isset($active->query['view']) && $active->query['view'] === 'profile'
) {
$this->setLayout($query['layout']);
$this->setLayout($active->query['layout']);
}

// Escape strings for HTML output
Expand Down
8 changes: 4 additions & 4 deletions htaccess.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Options -Indexes
</IfModule>
</IfModule>

## GZIP
## GZIP & BROTLI
## These directives are only enabled if the Apache mod_headers module is enabled.
## This section will check if a .gz file exists and if so will stream it
## directly or fallback to gzip any asset on the fly
Expand All @@ -157,9 +157,9 @@ Options -Indexes
RewriteCond "%{REQUEST_FILENAME}\.gz" -s
RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA]

# Serve correct content types, and prevent mod_deflate double gzip.
RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
RewriteRule "\.js\.gz$" "-" [T=text/javascript,E=no-gzip:1]
# Serve correct content types, and prevent mod_deflate double compression.
RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1,E=no-brotli:1]
RewriteRule "\.js\.gz$" "-" [T=text/javascript,E=no-gzip:1,E=no-brotli:1]

<FilesMatch "(\.js\.gz|\.css\.gz)$">
# Serve correct encoding type.
Expand Down
8 changes: 7 additions & 1 deletion libraries/src/MVC/View/ListView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,13 @@ protected function addToolbar()
$bar->appendButton('Custom', $dhtml, 'batch');
}

if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) {
if (
$canDo->get('core.delete') &&
(
$this->state->get('filter.state') == -2 ||
$this->state->get('filter.published') == -2
)
) {
ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', $viewName . '.delete', 'JTOOLBAR_EMPTY_TRASH');
} elseif ($canDo->get('core.edit.state')) {
ToolbarHelper::trash($viewName . '.trash');
Expand Down