Post-install messages: show the correct title when revisiting the com…

…ponent
joomla · Aug 27, 2014 · e698229 · e698229
1 parent 22dc712
commit e698229
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/administrator/components/com_postinstall/toolbar.php b/administrator/components/com_postinstall/toolbar.php
@@ -27,17 +27,6 @@ class PostinstallToolbar extends FOFToolbar
 	 */
 	public function onMessages()
 	{
-		$extension_name = JText::_('COM_POSTINSTALL_TITLE_JOOMLA');
-
-		$eid = $this->input->getInt('eid', 700);
-
-		if ($eid != 700)
-		{
-			$model = FOFModel::getTmpInstance('Messages', 'PostinstallModel');
-			$extension_name = $model->getExtensionName($eid);
-		}
-
-		JToolBarHelper::title(JText::sprintf('COM_POSTINSTALL_MESSAGES_TITLE', $extension_name));
 		JToolBarHelper::preferences($this->config['option'], 550, 875);
 		JToolbarHelper::help('JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES');
 	}

diff --git a/administrator/components/com_postinstall/views/messages/view.html.php b/administrator/components/com_postinstall/views/messages/view.html.php
@@ -42,6 +42,15 @@ protected function onBrowse($tpl = null)
 		$this->token = JFactory::getSession()->getFormToken();
 		$this->extension_options = $model->getComponentOptions();
 
+		$extension_name = JText::_('COM_POSTINSTALL_TITLE_JOOMLA');
+
+		if ($this->eid != 700)
+		{
+			$extension_name = $model->getExtensionName($this->eid);
+		}
+
+		JToolBarHelper::title(JText::sprintf('COM_POSTINSTALL_MESSAGES_TITLE', $extension_name));
+
 		return parent::onBrowse($tpl);
 	}
 }