Fixes #3404, remove feedburner plugin and allow Piwik to work if plugin folders do not exist.

Notes:

  * Display warning if there are loaded plugins that cannot be found in the plugins diretory.


git-svn-id: http://dev.piwik.org/svn/trunk@7296 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 17 insertions, 1 deletions

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index aa85d01570..dca5c71c2c 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -22,7 +22,11 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
 
 		$plugins = array();
 
-		$listPlugins = Piwik_PluginsManager::getInstance()->readPluginsDirectory();
+		$listPlugins = array_merge(
+			Piwik_PluginsManager::getInstance()->readPluginsDirectory(),
+			Piwik_Config::getInstance()->Plugins['Plugins']
+		);
+		$listPlugins = array_unique($listPlugins);
 		foreach($listPlugins as $pluginName)
 		{
 			$oPlugin = Piwik_PluginsManager::getInstance()->loadPlugin($pluginName);
@@ -39,6 +43,18 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
 			$pluginName = $oPlugin->getPluginName();
 			$plugins[$pluginName]['info'] = $oPlugin->getInformation();
 		}
+		
+		foreach($plugins as $pluginName => &$plugin)
+		{
+			if (!isset($plugin['info']))
+			{
+				$plugin['info'] = array(
+					'description' => '<strong><em>'.Piwik_Translate('CorePluginsAdmin_PluginCannotBeFound')
+						.'</strong></em>',
+					'version' => Piwik_Translate('General_Unknown')
+				);
+			}
+		}
 
 		$view = Piwik_View::factory('manage');
 		$view->pluginsName = $plugins;