Merge branch '4.2-dev' into fix/38001-notification-request-queue

administrator/components/com_admin/src/View/Sysinfo/HtmlView.php

@@ -82,7 +82,7 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null): void
 	{
 		// Access check.
-		if (!Factory::getUser()->authorise('core.admin'))
+		if (!$this->getCurrentUser()->authorise('core.admin'))
 		{
 			throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
 		}

administrator/components/com_associations/src/View/Associations/HtmlView.php

@@ -208,7 +208,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		if (isset($this->typeName) && isset($this->extensionName))
 		{

administrator/components/com_banners/src/View/Banner/HtmlView.php

@@ -95,7 +95,7 @@ protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$userId     = $user->id;
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(\is_null($this->item->checked_out) || $this->item->checked_out == $userId);

administrator/components/com_banners/src/View/Client/HtmlView.php

@@ -106,7 +106,7 @@ protected function addToolbar(): void
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(\is_null($this->item->checked_out) || $this->item->checked_out == $user->id);
 		$canDo      = $this->canDo;

administrator/components/com_cache/src/View/Cache/HtmlView.php

@@ -137,7 +137,7 @@ protected function addToolbar(): void
 			ToolbarHelper::divider();
 		}
 
-		if (Factory::getUser()->authorise('core.admin', 'com_cache'))
+		if ($this->getCurrentUser()->authorise('core.admin', 'com_cache'))
 		{
 			ToolbarHelper::preferences('com_cache');
 			ToolbarHelper::divider();

administrator/components/com_categories/src/View/Category/HtmlView.php

@@ -131,7 +131,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$extension = Factory::getApplication()->input->get('extension');
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 		$userId = $user->id;
 
 		$isNew = ($this->item->id == 0);

administrator/components/com_config/src/View/Application/HtmlView.php

@@ -66,7 +66,7 @@ public function display($tpl = null)
 			// Load Form and Data
 			$form = $this->get('form');
 			$data = $this->get('data');
-			$user = Factory::getUser();
+			$user = $this->getCurrentUser();
 		}
 		catch (\Exception $e)
 		{

administrator/components/com_config/src/View/Component/HtmlView.php

@@ -70,7 +70,7 @@ public function display($tpl = null)
 			}
 
 			$form = $this->get('form');
-			$user = Factory::getUser();
+			$user = $this->getCurrentUser();
 		}
 		catch (\Exception $e)
 		{

administrator/components/com_contact/src/View/Contact/HtmlView.php

@@ -99,7 +99,7 @@ protected function addToolbar()
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$userId     = $user->id;
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $userId);

administrator/components/com_content/src/View/Article/HtmlView.php

@@ -128,7 +128,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$userId     = $user->id;
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $userId);

administrator/components/com_fields/src/View/Field/HtmlView.php

@@ -91,7 +91,7 @@ protected function addToolbar()
 	{
 		$component = $this->state->get('field.component');
 		$section   = $this->state->get('field.section');
-		$userId    = Factory::getUser()->get('id');
+		$userId    = $this->getCurrentUser()->get('id');
 		$canDo     = $this->canDo;
 
 		$isNew      = ($this->item->id == 0);

administrator/components/com_fields/src/View/Fields/HtmlView.php

@@ -152,7 +152,7 @@ protected function addToolbar()
 			$toolbar->addNew('field.add');
 		}
 
-		if ($canDo->get('core.edit.state') || Factory::getUser()->authorise('core.admin'))
+		if ($canDo->get('core.edit.state') || $this->getCurrentUser()->authorise('core.admin'))
 		{
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
@@ -172,7 +172,7 @@ protected function addToolbar()
 				$childBar->archive('fields.archive')->listCheck(true);
 			}
 
-			if (Factory::getUser()->authorise('core.admin'))
+			if ($this->getCurrentUser()->authorise('core.admin'))
 			{
 				$childBar->checkin('fields.checkin')->listCheck(true);
 			}

administrator/components/com_fields/src/View/Group/HtmlView.php

@@ -116,7 +116,7 @@ protected function addToolbar()
 			$component = $parts[0];
 		}
 
-		$userId    = Factory::getUser()->get('id');
+		$userId    = $this->getCurrentUser()->get('id');
 		$canDo     = $this->canDo;
 
 		$isNew      = ($this->item->id == 0);

administrator/components/com_fields/src/View/Groups/HtmlView.php

@@ -154,7 +154,7 @@ protected function addToolbar()
 			$toolbar->addNew('group.add');
 		}
 
-		if ($canDo->get('core.edit.state') || Factory::getUser()->authorise('core.admin'))
+		if ($canDo->get('core.edit.state') || $this->getCurrentUser()->authorise('core.admin'))
 		{
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
@@ -174,7 +174,7 @@ protected function addToolbar()
 				$childBar->archive('groups.archive')->listCheck(true);
 			}
 
-			if (Factory::getUser()->authorise('core.admin'))
+			if ($this->getCurrentUser()->authorise('core.admin'))
 			{
 				$childBar->checkin('groups.checkin')->listCheck(true);
 			}

administrator/components/com_finder/src/View/Filter/HtmlView.php

@@ -113,7 +113,7 @@ protected function addToolbar()
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
 		$isNew = ($this->item->filter_id == 0);
-		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == Factory::getUser()->id);
+		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $this->getCurrentUser()->id);
 		$canDo = ContentHelper::getActions('com_finder');
 
 		// Configure the toolbar.

administrator/components/com_installer/src/View/Install/HtmlView.php

@@ -37,7 +37,7 @@ class HtmlView extends InstallerViewDefault
 	 */
 	public function display($tpl = null)
 	{
-		if (!Factory::getUser()->authorise('core.admin'))
+		if (!$this->getCurrentUser()->authorise('core.admin'))
 		{
 			throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
 		}

administrator/components/com_installer/src/View/Languages/HtmlView.php

@@ -46,7 +46,7 @@ class HtmlView extends InstallerViewDefault
 	 */
 	public function display($tpl = null)
 	{
-		if (!Factory::getUser()->authorise('core.admin'))
+		if (!$this->getCurrentUser()->authorise('core.admin'))
 		{
 			throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
 		}

administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php

@@ -278,7 +278,7 @@ protected function addToolbar()
 		}
 
 		// Add toolbar buttons.
-		if (Factory::getUser()->authorise('core.admin'))
+		if ($this->getCurrentUser()->authorise('core.admin'))
 		{
 			ToolbarHelper::preferences('com_joomlaupdate');
 		}

administrator/components/com_languages/src/View/Overrides/HtmlView.php

@@ -109,7 +109,7 @@ protected function addToolbar()
 			ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'overrides.delete', 'JTOOLBAR_DELETE');
 		}
 
-		if (Factory::getUser()->authorise('core.admin'))
+		if ($this->getCurrentUser()->authorise('core.admin'))
 		{
 			ToolbarHelper::custom('overrides.purge', 'refresh', '', 'COM_LANGUAGES_VIEW_OVERRIDES_PURGE', false);
 		}

administrator/components/com_mails/src/View/Templates/HtmlView.php

@@ -137,7 +137,7 @@ protected function addToolbar()
 	{
 		// Get the toolbar object instance
 		$toolbar = Toolbar::getInstance('toolbar');
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		ToolbarHelper::title(Text::_('COM_MAILS_MAILS_TITLE'), 'envelope');
 

administrator/components/com_media/src/View/Media/HtmlView.php

@@ -88,7 +88,7 @@ protected function prepareToolbar()
 
 		// Get the toolbar object instance
 		$bar  = Toolbar::getInstance('toolbar');
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		// Set the title
 		ToolbarHelper::title(Text::_('COM_MEDIA'), 'images mediamanager');

administrator/components/com_menus/src/View/Item/HtmlView.php

@@ -128,7 +128,7 @@ protected function addToolbar()
 		$input = Factory::getApplication()->input;
 		$input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $user->get('id'));
 		$canDo      = $this->canDo;

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

@@ -320,7 +320,7 @@ protected function addToolbar()
 		$menutypeId = (int) $this->state->get('menutypeid');
 
 		$canDo = ContentHelper::getActions('com_menus', 'menu', (int) $menutypeId);
-		$user  = Factory::getUser();
+		$user  = $this->getCurrentUser();
 
 		// Get the menu title
 		$menuTypeTitle = $this->get('State')->get('menutypetitle');
@@ -344,7 +344,7 @@ protected function addToolbar()
 
 		$protected = $this->state->get('filter.menutype') == 'main';
 
-		if (($canDo->get('core.edit.state') || Factory::getUser()->authorise('core.admin')) && !$protected
+		if (($canDo->get('core.edit.state') || $this->getCurrentUser()->authorise('core.admin')) && !$protected
 			|| $canDo->get('core.edit.state') && $this->state->get('filter.client_id') == 0)
 		{
 			$dropdown = $toolbar->dropdownButton('status-group')
@@ -363,7 +363,7 @@ protected function addToolbar()
 				$childBar->unpublish('items.unpublish')->listCheck(true);
 			}
 
-			if (Factory::getUser()->authorise('core.admin') && !$protected)
+			if ($this->getCurrentUser()->authorise('core.admin') && !$protected)
 			{
 				$childBar->checkin('items.checkin')->listCheck(true);
 			}
@@ -393,7 +393,7 @@ protected function addToolbar()
 			}
 		}
 
-		if (Factory::getUser()->authorise('core.admin'))
+		if ($this->getCurrentUser()->authorise('core.admin'))
 		{
 			$toolbar->standardButton('refresh')
 				->text('JTOOLBAR_REBUILD')

administrator/components/com_modules/src/View/Module/HtmlView.php

@@ -90,7 +90,7 @@ protected function addToolbar()
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $user->get('id'));
 		$canDo      = $this->canDo;

administrator/components/com_modules/src/View/Modules/HtmlView.php

@@ -180,7 +180,7 @@ protected function addToolbar()
 	{
 		$state = $this->get('State');
 		$canDo = ContentHelper::getActions('com_modules');
-		$user  = Factory::getUser();
+		$user  = $this->getCurrentUser();
 
 		// Get the toolbar object instance
 		$toolbar = Toolbar::getInstance('toolbar');
@@ -200,7 +200,7 @@ protected function addToolbar()
 				->onclick("location.href='index.php?option=com_modules&view=select&client_id=" . $this->state->get('client_id', 0) . "'");
 		}
 
-		if (!$this->isEmptyState && ($canDo->get('core.edit.state') || Factory::getUser()->authorise('core.admin')))
+		if (!$this->isEmptyState && ($canDo->get('core.edit.state') || $this->getCurrentUser()->authorise('core.admin')))
 		{
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
@@ -218,7 +218,7 @@ protected function addToolbar()
 				$childBar->unpublish('modules.unpublish')->listCheck(true);
 			}
 
-			if (Factory::getUser()->authorise('core.admin'))
+			if ($this->getCurrentUser()->authorise('core.admin'))
 			{
 				$childBar->checkin('modules.checkin')->listCheck(true);
 			}

administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php

@@ -104,7 +104,7 @@ protected function addToolbar()
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $user->get('id'));
 

administrator/components/com_postinstall/src/View/Messages/HtmlView.php

@@ -81,7 +81,7 @@ private function toolbar()
 		}
 
 		// Options button.
-		if (Factory::getUser()->authorise('core.admin', 'com_postinstall'))
+		if ($this->getCurrentUser()->authorise('core.admin', 'com_postinstall'))
 		{
 			$toolbar->preferences('com_postinstall');
 			$toolbar->help('Post-installation_Messages_for_Joomla_CMS');

administrator/components/com_tags/src/View/Tag/HtmlView.php

@@ -99,7 +99,7 @@ protected function addToolbar()
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$userId     = $user->get('id');
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $userId);

administrator/components/com_templates/src/View/Template/HtmlView.php

@@ -224,7 +224,7 @@ public function display($tpl = null)
 
 		$this->addToolbar();
 
-		if (!Factory::getUser()->authorise('core.admin'))
+		if (!$this->getCurrentUser()->authorise('core.admin'))
 		{
 			$this->setLayout('readonly');
 		}
@@ -242,7 +242,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$app   = Factory::getApplication();
-		$user  = Factory::getUser();
+		$user  = $this->getCurrentUser();
 		$app->input->set('hidemainmenu', true);
 
 		// User is global SuperUser

administrator/components/com_users/src/View/Debuggroup/HtmlView.php

@@ -90,7 +90,7 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null)
 	{
 		// Access check.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		if (!$this->getCurrentUser()->authorise('core.manage', 'com_users'))
 		{
 			throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
 		}

administrator/components/com_users/src/View/Debuguser/HtmlView.php

@@ -90,7 +90,7 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null)
 	{
 		// Access check.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		if (!$this->getCurrentUser()->authorise('core.manage', 'com_users'))
 		{
 			throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
 		}

administrator/components/com_users/src/View/Note/HtmlView.php

@@ -92,7 +92,7 @@ protected function addToolbar()
 		$input = Factory::getApplication()->input;
 		$input->set('hidemainmenu', 1);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$isNew      = ($this->item->id == 0);
 		$checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $user->get('id'));
 

administrator/components/com_users/src/View/Users/HtmlView.php

@@ -124,7 +124,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$canDo = $this->canDo;
-		$user  = Factory::getUser();
+		$user  = $this->getCurrentUser();
 
 		// Get the toolbar object instance
 		$toolbar = Toolbar::getInstance('toolbar');

administrator/components/com_workflow/src/View/Stage/HtmlView.php

@@ -116,7 +116,7 @@ protected function addToolbar()
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$userId     = $user->id;
 		$isNew      = empty($this->item->id);
 

administrator/components/com_workflow/src/View/Stages/HtmlView.php

@@ -166,7 +166,7 @@ protected function addToolbar()
 	{
 		$canDo = ContentHelper::getActions($this->extension, 'workflow', $this->workflowID);
 
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		$toolbar = Toolbar::getInstance('toolbar');
 

administrator/components/com_workflow/src/View/Transition/HtmlView.php

@@ -146,7 +146,7 @@ protected function addToolbar()
 	{
 		Factory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$userId     = $user->id;
 		$isNew      = empty($this->item->id);