how to make it faster to loading modules?

shaunlee · Sep 12, 2013 · 6c4c941 · 6c4c941
1 parent 33f8e07
commit 6c4c941
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/ajoy/ajoy.php b/ajoy/ajoy.php
@@ -1345,26 +1345,19 @@ public function loadModels($className)
      */
     public function loadModules()
     {
-        static $loadedModules = array();
-
-        foreach ($this->get('modules') as $module) {
-            if (isset($loadedModules[$module]))
-                continue;
-
-            $paths = explode('.', $module);
-            $modfile = '/modules/' . implode('/', $paths) . '.php';
+        array_map(function($module) {
+            $modfile = '/modules/' . $module . '.php';
 
             $filename = $this->get('app root') . $modfile;
-            if (!file_exists($filename))
+            if (!file_exists($filename)) {
                 $filename = $this->get('ajoy root') . $modfile;
 
-            if (!file_exists($filename))
-                $this->raise('Module with name "' . $module . '" does not exists.');
+                if (!file_exists($filename))
+                    $this->raise('Module with name "' . $module . '" does not exists.');
+            }
 
             include $filename;
-
-            $loadedModules[$module] = true;
-        }
+        }, $this->get('modules'));
     }
 
     /**