Arie W. Subagja avatar Arie W. Subagja committed ae8bf51

no need to include file, use Kohana::$config instead

Comments (0)

Files changed (1)

classes/malam/route.php

     /**
      * @return Malam_Route
      */
-    public static function instance()
+    public static function factory()
     {
-        static $instance;
-        empty($instance) && $instance = new self;
-        return $instance;
+        return new self();
     }
 
     private function __construct()
     {
-        $this->routes = Kohana::find_file('config', 'route', NULL, TRUE);
-        sort($this->routes);
+        $this->routes = Kohana::$config->load('route');
     }
 
     public function run()
             'defaults'  => NULL,
         );
 
-        foreach ($this->routes as $route_config)
+        foreach ($this->routes as $key => $values)
         {
-            $temp = require_once $route_config;
+            $values += $default_values;
+            extract($values);
 
-            if ($temp)
+            if ((Kohana::$is_cli && TRUE == $is_cli) || (! Kohana::$is_cli && FALSE == $is_cli))
             {
-                foreach ($temp as $key => $values)
-                {
-                    $values += $default_values;
-                    extract($values);
-
-                    if ((Kohana::$is_cli && TRUE == $is_cli) || (! Kohana::$is_cli && FALSE == $is_cli))
-                    {
-                        Route::set($key, $uri_callback, $regex)->defaults($defaults);
-                    }
-                }
+                Route::set($key, $uri_callback, $regex)->defaults($defaults);
             }
         }
     }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.