Changeset 106 for trunk/trax/vendor/trax/action_controller.php

Timestamp:

01/01/06 21:37:32 (6 years ago)

Author:

john

Message:

added a bunch of stuff for scaffolding

Files:

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

trunk/trax/vendor/trax/action_controller.php

@@ -199 +199 @@
                     if(file_exists(TRAX_LIB_ROOT."/scaffold_controller.php")) {
                         include_once(TRAX_LIB_ROOT."/scaffold_controller.php");
-                        $this->controller_object = new ScaffoldController($scaffold, $this->controller, $this->action);
+                        $GLOBALS['current_controller_object'] = $this->controller_object = new ScaffoldController($scaffold, $this->controller, $this->action);
                         if($this->action) {
                             $this->view_file = TRAX_LIB_ROOT . "/templates/scaffolds/".$this->action.".phtml";
@@ -291 +291 @@
                     ob_end_clean();
 
-                    if(file_exists($this->layout_file)) {
+                    if(file_exists($this->layout_file) && $render_layout !== false) {
                         # render the layout
                         include($this->layout_file);