fix showing internal plugins

diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php
index 6a86233caa98edf738eb0c4ce899e3efd9e4b1e0..a110050b986eedbef513435cc594b13777c21282 100644 (file)
--- a/include/admin/plugins.inc.php
+++ b/include/admin/plugins.inc.php
@@ -571,7 +571,6 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
 
     $counter    = 0;
     foreach ($classes as $class_data) {
-
         $pluginFile =  serendipity_plugin_api::probePlugin($class_data['name'], $class_data['classname'], $class_data['pluginPath']);
         $plugin     =& serendipity_plugin_api::getPluginInfo($pluginFile, $class_data, $serendipity['GET']['type']);
 

diff --git a/include/plugin_api.inc.php b/include/plugin_api.inc.php
index 2207145dc5f7adf1200e2dcf869cd36d58527c79..8ab525a08e77ca42281c0549dac20b77ad7a9f70 100644 (file)
--- a/include/plugin_api.inc.php
+++ b/include/plugin_api.inc.php
@@ -449,7 +449,7 @@ class serendipity_plugin_api {
             }
         }
         
-        if (is_array($pluginlist[$pluginFile])) {
+        if (is_array($pluginlist[$pluginFile]) && !preg_match('@plugin_internal\.inc\.php@', $pluginFile)) {
             $data = $pluginlist[$pluginFile];
             if ((int)filemtime($pluginFile) == (int)$data['last_modified']) {
                 $data['stackable']    = serendipity_db_bool($data['stackable']);