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

Timestamp:

07/08/09 03:51:07 (3 years ago)

Author:

john

Message:

fixed a render bug render_performed = false when render as string

Files:

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

trunk/trax/vendor/trax/action_controller.php

@@ -530 +530 @@
                 $this->controller_class = Inflector::camelize(Inflector::demodulize($this->controller)) . "Controller";
                 $this->helper_file = $this->helpers_path . "/" .  $this->controller . "_helper.php";  
-                #error_log("controller:{$this->controller} - controller_file:{$this->controller_file} - controller_class:{$this->controller_class} - views_path:{$this->views_path}");
+                # error_log("controller:{$this->controller} - controller_file:{$this->controller_file} - controller_class:{$this->controller_class} - views_path:{$this->views_path}");
             }
         }
@@ -745 +745 @@
                         $locals['content_for_layout'] = $content_for_layout;
                         # render the layout
-                        //error_log("rendering layout: ".$this->controller_object->layout_file);
+                        #error_log("rendering layout: ".$this->controller_object->layout_file);
                         if(!$this->controller_object->render_file($this->controller_object->layout_file, false, $locals)) {
                             # No layout template so just echo out whatever is in $content_for_layout
@@ -1071 +1071 @@
         if($return_as_string) {
             $result = ob_get_contents();
-            ob_end_clean();
+            ob_end_clean();  
+            $this->render_performed = false;
             return $result;
         }         
@@ -1435 +1436 @@
      *  @throws ActionControllerError
      */
-    function raise($error_message, $error_heading, $error_code = "404") {
+    function raise($error_message, $error_heading, $error_code = "404") { 
         throw new ActionControllerError("Error Message: ".$error_message, $error_heading, $error_code);
     }
@@ -1466 +1467 @@
             }
         } else {
-            echo "<font face=\"verdana, arial, helvetica, sans-serif\">\n";
-            echo "<h2>Application Error</h2>Trax application failed to start properly";
-            echo "</font>\n";            
-        }
+            if($error_code == "404") {
+                echo "<h2>404 Error - File not found.</h2>";
+            } else {
+                echo "<font face=\"verdana, arial, helvetica, sans-serif\">\n";
+                echo "<h2>Application Error</h2>Trax application failed to start properly";
+                echo "</font>\n";                
+            }           
+        } 
+      
     }