Fix for controlers in subfolders

alez007 · Aug 7, 2012 · 264af68 · 264af68
1 parent 892ab95
commit 264af68
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Swiftlet/App.php b/Swiftlet/App.php
@@ -46,13 +46,17 @@ public function run()
  }
 
  if ( !is_file('Swiftlet/Controllers/' . $controllerName . '.php') ) {
- $controllerName = 'Error404';
+ $controllerName .= '/Index';
+
+ if ( !is_file('Swiftlet/Controllers/' . $controllerName . '.php') ) {
+ $controllerName = 'Error404';
+ }
  }
 
  $this->view = new View($this, strtolower($controllerName));
 
  // Instantiate the controller
- $controllerName = 'Swiftlet\Controllers\\' . basename($controllerName);
+ $controllerName = 'Swiftlet\Controllers\\' . str_replace('/', '\\', $controllerName);
 
  $this->controller = new $controllerName($this, $this->view);