fixed bug with file extensions in uri (fixed #20)

maximebf · Sep 24, 2013 · 4fb3432 · 4fb3432
1 parent 3830578
commit 4fb3432
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/example/app/config.php b/example/app/config.php
@@ -7,9 +7,13 @@
             'dsn' => 'sqlite:example.db'
         ),
         'Session',
-        'Flash'
+        'Flash',
+        'Errors' => array(
+            'catch_errors' => true
+        )
     ),
 
+    'atomik.debug' => true,
     'app.layout' => '_layout'
 
 ));
diff --git a/src/Atomik.php b/src/Atomik.php
@@ -572,10 +572,14 @@ public static function route($uri, $params = array(), $routes = null)
         }
 
         if (!$found) {
+            $format = self::get('app.views.default_context', 'html');
+            if ($uriExtension !== false) {
+                $uri = substr($uri, 0, -strlen($uriExtension) - 1);
+                $format = $uriExtension;
+            }
             $request = array(
                 'action' => $uri, 
-                self::get('app.views.context_param', 'format') => $uriExtension === false ? 
-                    self::get('app.views.default_context', 'html') : $uriExtension
+                self::get('app.views.context_param', 'format') => $format
             );
         }