[#30258] Added purge to find/update methods. Removed purge buttons. T…

…hanks Peter
joomla · Mar 16, 2013 · 389374f · 389374f
1 parent 3731c9c
commit 389374f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/administrator/components/com_installer/controllers/languages.php b/administrator/components/com_installer/controllers/languages.php
@@ -26,6 +26,10 @@ class InstallerControllerLanguages extends JControllerLegacy
 	 */
 	public function find()
 	{
+		// Purge the updates list
+		$model = $this->getModel('update');
+		$model->purge();
+
 		// Check for request forgeries
 		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
 
@@ -43,7 +47,7 @@ public function find()
 	}
 
 	/**
-	 * Purgue the updates list.
+	 * Purge the updates list.
 	 *
 	 * @return  void
 	 *

diff --git a/administrator/components/com_installer/models/discover.php b/administrator/components/com_installer/models/discover.php
@@ -72,6 +72,9 @@ protected function getListQuery()
 	 */
 	public function discover()
 	{
+		// Purge the list of discovered extensions
+		$this->purge();
+
 		$installer	= JInstaller::getInstance();
 		$results	= $installer->discover();
 

diff --git a/administrator/components/com_installer/models/update.php b/administrator/components/com_installer/models/update.php
@@ -145,6 +145,9 @@ protected function getListQuery()
 	 */
 	public function findUpdates($eid = 0, $cache_timeout = 0)
 	{
+		// Purge the updates list
+		$this->purge();
+
 		$updater = JUpdater::getInstance();
 		$results = $updater->findUpdates($eid, $cache_timeout);
 		return true;

diff --git a/administrator/components/com_installer/views/discover/view.html.php b/administrator/components/com_installer/views/discover/view.html.php
@@ -54,7 +54,6 @@ protected function addToolbar()
 		 */
 		JToolbarHelper::custom('discover.install', 'upload', 'upload', 'JTOOLBAR_INSTALL', true, false);
 		JToolbarHelper::custom('discover.refresh', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_DISCOVER', false, false);
-		JToolbarHelper::custom('discover.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false, false);
 		JToolbarHelper::divider();
 		parent::addToolbar();
 		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER');

diff --git a/administrator/components/com_installer/views/languages/view.html.php b/administrator/components/com_installer/views/languages/view.html.php
@@ -72,7 +72,6 @@ protected function addToolbar()
 		{
 			JToolBarHelper::custom('languages.install', 'upload', 'upload', 'COM_INSTALLER_TOOLBAR_INSTALL', true, false);
 			JToolBarHelper::custom('languages.find', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_FIND_LANGUAGES', false, false);
-			JToolBarHelper::custom('languages.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false, false);
 			JToolBarHelper::divider();
 			parent::addToolbar();
 

diff --git a/administrator/components/com_installer/views/update/view.html.php b/administrator/components/com_installer/views/update/view.html.php
@@ -82,7 +82,6 @@ protected function addToolbar()
 
 		JToolbarHelper::custom('update.update', 'upload', 'upload', 'COM_INSTALLER_TOOLBAR_UPDATE', true, false);
 		JToolbarHelper::custom('update.find', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_FIND_UPDATES', false, false);
-		JToolbarHelper::custom('update.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false, false);
 		JToolbarHelper::divider();
 
 		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE');

diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -28,6 +28,7 @@ $ -> Language fix or change
 
 16-Mar-2013 Michael Babker
  # [#30259] Added (min) height to table cells with context.  Thanks Peter
+ ^ [#30258] Added purge to find/update methods. Removed purge buttons.  Thanks Peter
 
 16-Mar-2013 Jean-Marie Simonet
  #$ [#30231] *TAGS: does not filter on language. Thanks Elin