Changeset 3255

Timestamp:

08/04/2008 08:25:55 PM (4 months ago)

Author:

Shadowhand

Message:

Merged r3254 into tags/2.1.3

Files:

• tags/2.1.3/modules/forge/libraries/Forge.php (modified) (8 diffs)

tags/2.1.3/modules/forge/libraries/Forge.php

@@ -37 +37 @@
          * @return  void
          */
-        public function __construct($action = '', $title = '', $method = NULL, $attr = array())
+        public function __construct($action = NULL, $title = '', $method = NULL, $attr = array())
         {
                 // Set form attributes
@@ -88 +88 @@
 
                 // Create the input
-                switch(count($args))
+                switch (count($args))
                 {
                         case 1:
@@ -157 +157 @@
         {
                 $status = TRUE;
-                foreach($this->inputs as $input)
+
+                $inputs = array_merge($this->hidden, $this->inputs);
+
+                foreach ($inputs as $input)
                 {
                         if ($input->validate() == FALSE)
@@ -176 +179 @@
         {
                 $data = array();
-                foreach(array_merge($this->hidden, $this->inputs) as $input)
-                {
-                        if ($name = $input->name)
+                foreach (array_merge($this->hidden, $this->inputs) as $input)
+                {
+                        if (is_object($input->name)) // It's a Forge_Group object (hopefully)
+                        {
+                                foreach ($input->inputs as $group_input)
+                                {
+                                        if ($name = $group_input->name)
+                                        {
+                                                $data[$name] = $group_input->value;
+                                        }
+                                }
+                        }
+                        else if (is_array($input->inputs))
+                        {
+                                foreach ($input->inputs as $group_input)
+                                {
+                                        if ($name = $group_input->name)
+                                        {
+                                                $data[$name] = $group_input->value;
+                                        }
+                                }
+                        }
+                        else if ($name = $input->name) // It's a normal input
                         {
                                 // Return only named inputs
@@ -210 +233 @@
          * @return  string
          */
-        public function html($template = 'forge_template', $custom = FALSE)
+        public function render($template = 'forge_template', $custom = FALSE)
         {
                 // Load template
@@ -233 +256 @@
                                 if (is_array($errors) AND ! empty($errors))
                                 {
-                                        foreach($errors as $error)
+                                        foreach ($errors as $error)
                                         {
                                                 // Replace the message with the error in the html error string
@@ -253 +276 @@
                         if ( ! empty($this->hidden))
                         {
-                                foreach($this->hidden as $input)
+                                foreach ($this->hidden as $input)
                                 {
                                         $hidden[$input->name] = $input->value;
@@ -285 +308 @@
         public function __toString()
         {
-                return $this->html();
+                return (string) $this->render();
         }