0
@@ -72,7 +72,7 @@ class midcom_core_controllers_page extends midcom_core_controllers_baseclasses_m
0
                     $this->object->create();
0
                     break;
0
                 default:
0
-                    throw new midcom_exception_httperror("{$this->request_method} not allowed", 405);
0
+                    throw new midcom_exception_httperror("{$this->dispatcher->request_method} not allowed", 405);
0
             }
0
         }
0
     }

0
@@ -473,15 +473,14 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
             
0
             foreach ($route_path_matches[1] as $index => $varname)
0
             {
0
-                preg_match('%/{\$([a-zA-Z]+):([a-zA-Z]+)}/%', $varname, $matches);
0
-                
0
-                if(count($matches) == 0)
0
+                $variable_parts = explode(':', $varname);
0
+                if(count($variable_parts) == 1)
0
                 {
0
                     $type_hint = '';
0
                 }
0
                 else
0
                 {
0
-                    $type_hint = $matches[1];
0
+                    $type_hint = $variable_parts[0];
0
                 }
0
                                 
0
                 // Strip type hints from variable names
0
@@ -490,7 +489,7 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
                 if ($type_hint == 'token')
0
                 {
0
                     // Tokenize the argument to handle resource typing
0
-                    $this->action_arguments[$route_id][$varname] = $this->tokenize_argument($this->get[$get_key]);
0
+                    $this->action_arguments[$route_id][$varname] = $this->tokenize_argument($route_path_regex_matches[$index + 1]);
0
                 }
0
                 else
0
                 {
0
@@ -517,6 +516,42 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
         }
0
         return true;
0
     }
0
+    
0
+    private function tokenize_argument($argument)
0
+    {
0
+        $tokens = array
0
+        (
0
+            'identifier' => '',
0
+            'variant'    => '',
0
+            'language'   => '',
0
+            'type'       => 'html',
0
+        );
0
+        $argument_parts = explode('.', $argument);
0
+
0
+        // First part is always identifier
0
+        $tokens['identifier'] = $argument_parts[0];
0
+        
0
+        if (count($argument_parts) >= 2)
0
+        {
0
+            // If there are two or more parts, then second is variant
0
+            $tokens['variant'] = $argument_parts[1];
0
+        }
0
+        
0
+        if (count($argument_parts) >= 3)
0
+        {
0
+            // If there are three parts, then third is type
0
+            $tokens['type'] = $argument_parts[2];
0
+        }
0
+
0
+        if (count($argument_parts) >= 4)
0
+        {
0
+            // If there are four or more parts, then third is language and fourth is type
0
+            $tokens['language'] = $argument_parts[2];
0
+            $tokens['type'] = $argument_parts[3];
0
+        }
0
+        
0
+        return $tokens;
0
+    }
0
 
0
     /**
0
      * Checks GET part of a route definition and places arguments as needed