Browse Source

fix user plugin not loading default config file

CauseFX 4 years ago
parent
commit
4e10f15da6
1 changed files with 13 additions and 0 deletions
  1. 13 0
      api/classes/organizr.class.php

+ 13 - 0
api/classes/organizr.class.php

@@ -1347,6 +1347,19 @@ class Organizr
 				$loadedDefaults = array_merge($loadedDefaults, $this->loadConfig($info->getPathname()));
 			}
 		}
+		/*
+		 * Include all custom Plugin routes
+		 */
+		if (file_exists(dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'plugins')) {
+			$folder = dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'plugins';
+			$directoryIterator = new RecursiveDirectoryIterator($folder, FilesystemIterator::SKIP_DOTS);
+			$iteratorIterator = new RecursiveIteratorIterator($directoryIterator);
+			foreach ($iteratorIterator as $info) {
+				if ($info->getFilename() == 'config.php') {
+					$loadedDefaults = array_merge($loadedDefaults, $this->loadConfig($info->getPathname()));
+				}
+			}
+		}
 		return (is_array($loadedDefaults) ? $this->fillDefaultConfig_recurse($array, $loadedDefaults) : false);
 	}