Merge branch '4.4-dev' into 4.4/application-input

laoneo · web-flow · commit 7ba9127ab0ec · 2023-04-03T20:16:07.000+02:00
diff --git a/administrator/components/com_messages/src/View/Messages/HtmlView.php b/administrator/components/com_messages/src/View/Messages/HtmlView.php
@@ -152,8 +152,9 @@ protected function addToolbar()
             }
         }
 
-        $toolbar->appendButton('Link', 'cog', 'COM_MESSAGES_TOOLBAR_MY_SETTINGS', 'index.php?option=com_messages&amp;view=config');
-        ToolbarHelper::divider();
+        $toolbar->linkButton('cog', 'COM_MESSAGES_TOOLBAR_MY_SETTINGS')
+            ->url('index.php?option=com_messages&amp;view=config');
+        $toolbar->divider();
 
         if (!$this->isEmptyState && $this->state->get('filter.state') == -2 && $canDo->get('core.delete')) {
             $toolbar->delete('messages.delete')

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,9 @@ protected function addToolbar()`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- $toolbar->appendButton('Link', 'cog', 'COM_MESSAGES_TOOLBAR_MY_SETTINGS', 'index.php?option=com_messages&view=config');`
`156`		`- ToolbarHelper::divider();`
	`155`	`+ $toolbar->linkButton('cog', 'COM_MESSAGES_TOOLBAR_MY_SETTINGS')`
	`156`	`+ ->url('index.php?option=com_messages&view=config');`
	`157`	`+ $toolbar->divider();`
`157`	`158`
`158`	`159`	`if (!$this->isEmptyState && $this->state->get('filter.state') == -2 && $canDo->get('core.delete')) {`
`159`	`160`	`$toolbar->delete('messages.delete')`