[php-blog-cvs] serendipity serendipity_plugin_api.php,1.15,1.16

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

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

Modified Files:
	serendipity_plugin_api.php 
Log Message:
shared installation: local plugins are preferred over global ones


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_plugin_api.php	21 Mar 2004 16:58:31 -0000	1.15
+++ serendipity_plugin_api.php	23 Mar 2004 16:11:34 -0000	1.16
@@ -189,6 +189,12 @@
                         unset($classes[$existing]);
                     }
                     
+                    $existing = array_search($f, $classes);
+                    if ($existing !== null && $existing !== false) {
+                        // A local plugin will be preferred over general plugins
+                        unset($classes[$existing]);
+                    }
+
                     if (file_exists($local_ppath . '/' . $f . '/' . $f . '.php')) {
                         $classes[] = $f;
                     }