array casting to prevent ugly errors

diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php
index 663968ec1f5305494d6f7c18962bef1c00335887..f5f843a3aa87456b293266122fb80494d78dc233 100644 (file)
--- a/include/admin/plugins.inc.php
+++ b/include/admin/plugins.inc.php
@@ -534,12 +534,12 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
 <?php
     $foreignPlugins = $pluginstack = $errorstack = array();
     serendipity_plugin_api::hook_event('backend_plugins_fetchlist', $foreignPlugins);
-    $pluginstack = array_merge($foreignPlugins['pluginstack'], $pluginstack);
-    $errorstack  = array_merge($foreignPlugins['errorstack'], $errorstack);
+    $pluginstack = array_merge((array)$foreignPlugins['pluginstack'], $pluginstack);
+    $errorstack  = array_merge((array)$foreignPlugins['errorstack'], $errorstack);
 
     $plugins = serendipity_plugin_api::get_installed_plugins();
     $classes = serendipity_plugin_api::enum_plugin_classes(($serendipity['GET']['type'] == 'event'));
-    usort($classes, 'serendipity_pluginListSort'); 
+    usort($classes, 'serendipity_pluginListSort');
 
     $counter    = 0;
     foreach ($classes as $class_data) {