Merge branch '4.0-dev' into 21225-fix-menu-selection

Author: roland-d

administrator/components/com_menus/View/Items/HtmlView.php

@@ -212,7 +212,7 @@ public function display($tpl = null)
 								// Get XML file from component folder for standard layouts
 								$file = JPATH_SITE . '/components/' . $item->componentname . '/tmpl/' . $vars['view']
 									. '/' . $vars['layout'] . '.xml';
-								
+
 								if (!file_exists($file))
 								{
 									$file = JPATH_SITE . '/components/' . $item->componentname . '/views/'
@@ -224,7 +224,6 @@ public function display($tpl = null)
 											. $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';
 									}
 								}
-								
 							}
 
 							if (is_file($file) && $xml = simplexml_load_file($file))

libraries/src/Session/Storage/JoomlaStorage.php

@@ -63,7 +63,7 @@ public function __construct(Input $input, \SessionHandlerInterface $handler = nu
 			'use_trans_sid' => 0,
 		];
 
-		if (!headers_sent())
+		if (!headers_sent() && !$this->isActive())
 		{
 			session_cache_limiter('none');
 		}
@@ -229,7 +229,7 @@ public function set(string $name, $value = null)
 	 */
 	protected function setCookieParams()
 	{
-		if (headers_sent())
+		if (headers_sent() || $this->isActive())
 		{
 			return;
 		}