[5.1] Merge pull request #43172 from LadySolveig/5.1/upmerges/2024-03-28

Author: bembelimen

components/com_users/src/View/Profile/HtmlView.php

@@ -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

htaccess.txt

@@ -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
@@ -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.

libraries/src/MVC/View/ListView.php

@@ -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');