[Fusionforge-commits] r14200 - trunk/src/www/admin

Olivier Berger olberger at fusionforge.org
Tue Aug 23 17:39:41 CEST 2011


Author: olberger
Date: 2011-08-23 17:39:41 +0200 (Tue, 23 Aug 2011)
New Revision: 14200

Modified:
   trunk/src/www/admin/pluginman.php
Log:
gracefully fail if plugin cannot be loaded

Modified: trunk/src/www/admin/pluginman.php
===================================================================
--- trunk/src/www/admin/pluginman.php	2011-08-23 15:39:36 UTC (rev 14199)
+++ trunk/src/www/admin/pluginman.php	2011-08-23 15:39:41 UTC (rev 14200)
@@ -103,9 +103,13 @@
 			$pm->LoadPlugin($pluginname);
 
 			$plugin = $pm->GetPluginObject($pluginname);
-			$plugin->installCode();
-			$plugin->installConfig();
-			$plugin->installDatabase();
+			if (!$plugin || $plugin->isError()) {
+				exit_error(_("Couldn't get plugin object"), 'admin');
+			} else {
+				$plugin->installCode();
+				$plugin->installConfig();
+				$plugin->installDatabase();
+			}
 		}
 	}
 }




More information about the Fusionforge-commits mailing list