Changeset 292

Timestamp:

08/07/07 09:44:45 (5 years ago)

Author:

john

Message:

fixed AC id wasn't being set on custom routes

Files:

• trunk/trax/vendor/trax/action_controller.php (modified) (2 diffs)

trunk/trax/vendor/trax/action_controller.php

@@ -499 +499 @@
                 }
                 //error_log('action='.$this->action);
+
                 //  FIXME: RoR uses :name as a keyword parameter, id
                 //  is not treated as a special case.
                 //  Do we want to do the same?
-                if(@in_array(":id",$route_path)
+                if(is_array($route_params)
+                   && array_key_exists(":id",$route_params)) {
+
+                    //  ':id' in route params overrides URL
+                    $this->id = $route_params[':id'];
+                } elseif(@in_array(":id",$route_path)
                    && array_key_exists(@array_search(":id", $route_path),
                                        $this->url_path)) {
@@ -511 +517 @@
                         $this->action_params['id'] = $this->id;
                     }
-                    //  For historical reasons, continue to pass id
-                    //  in $_REQUEST
-                    if($this->id != "") {
-                        $_REQUEST['id'] = $this->id;
-                    }
                 }
+                //  For historical reasons, continue to pass id
+                //  in $_REQUEST
+                if($this->id != "") {
+                    $_REQUEST['id'] = $this->id;
+                }
+                //error_log('id='.$this->id);
+
                 $this->views_path .= "/" . $this->controller;
                 $this->controller_file = $this->controllers_path . "/" .  $this->controller . "_controller.php";