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

Timestamp:

05/23/06 03:30:12 (6 years ago)

Author:

john

Message:

ActionMailer? rewrite to add mailer views/models

Files:

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

trunk/trax/vendor/trax/action_controller.php

@@ -1049 +1049 @@
                 unset($tmp_key);
                 unset($tmp_value);
-            }        
+            }     
             include($path);
             $this->render_performed = true;  
@@ -1102 +1102 @@
             $file_with_path = $this->views_path."/_".$file.".".$this->views_file_extention;
         }
-
+        
         if(file_exists($file_with_path)) {
             
@@ -1121 +1121 @@
 
             $locals = array_key_exists("locals", $options) ? $options['locals'] : array();
-            if(array_key_exists("collection", $options)) {
+            if(array_key_exists("collection", $options) && is_array($options['collection'])) {
                 foreach($options['collection'] as $tmp_value) {
                     ${$file."_counter"}++;
@@ -1163 +1163 @@
                    && $this->layout != '')
             ? $this->layout : $this->controller;
-        
+    
         # Check if a method has been defined to determine the layout at runtime
         if(method_exists($this, $layout)) {
@@ -1181 +1181 @@
                 $path = substr($layout, 0, strripos($layout, "/"));
                 $layout = $layouts_base_path."/".$path."/".$file.".".$this->views_file_extention;
-            } elseif( isset($this->layout) && ($this->layout != '') ) {
-                # Is there a layout for the current controller
-                $layout = $layouts_base_path."/".$this->layout.".".$this->views_file_extention;                    
             } else {
                 # Is there a layout for the current controller