[php-blog-cvs] serendipity/include plugin_api.inc.php,1.12,1.13

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22535/include

Modified Files:
	plugin_api.inc.php 
Log Message:
show error message when failed loading sidebar plugin


Index: plugin_api.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- plugin_api.inc.php	6 Jan 2005 20:16:20 -0000	1.12
+++ plugin_api.inc.php	8 Jan 2005 14:28:22 -0000	1.13
@@ -379,20 +379,26 @@
         $pluginData = array();
         foreach ($plugins as $plugin_data) {
             $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid'], $plugin_data['path']);
-            $class  = get_class($plugin);
-            $title  = '';
+            if (is_object($plugin)) {
+                $class  = get_class($plugin);
+                $title  = '';
 
-            /* TODO: make generate_content NOT echo its output */
-            ob_start();
-            $show_plugin = $plugin->generate_content($title);
-            $content = ob_get_contents();
-            ob_end_clean();
+                /* TODO: make generate_content NOT echo its output */
+                ob_start();
+                $show_plugin = $plugin->generate_content($title);
+                $content = ob_get_contents();
+                ob_end_clean();
 
-            if ($show_plugin !== FALSE) {
-                $pluginData[] = array('side'    => $side,
-                                      'class'   => $class,
-                                      'title'   => $title,
-                                      'content' => $content);
+                if ($show_plugin !== FALSE) {
+                    $pluginData[] = array('side'    => $side,
+                                          'class'   => $class,
+                                          'title'   => $title,
+                                          'content' => $content);
+                }
+            } elseif ($show_plugin !== FALSE) {
+                    $pluginData[] = array('side'          => $side,
+                                          'title'         => ERROR,
+                                          'content'       => sprintf(INCLUDE_ERROR, $plugin_data['name']));
             }
         }