Rewritten handling of menu weightning and updating/deleting menu entries except admin...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 8394f5f98c3e62932c4a10c59e4a06283368c0ad..4cd8715360a4e2215763538d547bc3198d3abe2b 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2142,19 +2142,13 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
                                // Remove both for extension name
                                $extName = substr($baseFile, strlen($prefix), -4);
 
-                               // Is the extension valid and active?
-                               if (isExtensionNameValid($extName)) {
-                                       // Then add this file
-                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension entry ' . $baseFile . ' added.');
+                               // Add file with or without base path
+                               if ($addBaseDir === true) {
+                                       // With base path
                                        $files[] = $fileName;
                                } else {
-                                       // Add non-extension files as well
-                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Regular entry ' . $baseFile . ' added.');
-                                       if ($addBaseDir === true) {
-                                               $files[] = $fileName;
-                                       } else {
-                                               $files[] = $baseFile;
-                                       }
+                                       // No base path
+                                       $files[] = $baseFile;
                                }
                        } else {
                                // We found .php file but should not search for them, why?