Changeset 1437

Timestamp:

12/06/07 20:15:37 (9 months ago)

Author:

Shadowhand

Message:

Changes to core:

• date::timestamp() variable name typo
  
• form::input() no longer puts an id on array-keyed inputs
  
• form::label() no longer
  
• added arr::unshift_assoc()
  
• replace a couple of internal find_all() calls with load_result(TRUE) to avoid an extra method call
  
• fixed a bug in Mysql_Result::result_array() that made multiple calls fail after the first call do to the pointer not being reset
  
• small code and comment cleanups
  

Location:

trunk/system

Files:

• helpers/arr.php (modified) (3 diffs)
• helpers/date.php (modified) (1 diff)
• helpers/form.php (modified) (2 diffs)
• libraries/ORM.php (modified) (3 diffs)
• libraries/drivers/Database_Mysql.php (modified) (2 diffs)

trunk/system/helpers/arr.php

@@ -24 +24 @@
          *  The transformed array
          */
-        function rotate($source_array, $keep_keys = TRUE)
+        public function rotate($source_array, $keep_keys = TRUE)
         {
                 $new_array = array();
@@ -50 +50 @@
          *  The value of the requested array key
          */
-        function remove($key, & $array)
+        public function remove($key, & $array)
         {
                 if ( ! isset($array[$key]))
@@ -60 +60 @@
                 return $val;
         }
-}
+
+        /**
+         * Because PHP does not have this function.
+         *
+         * @param   array   array to unshift
+         * @param   string  key to unshift
+         * @param   mixed   value to unshift
+         * @return  array
+         */
+        public function unshift_assoc( array & $array, $key, $val)
+        {
+                $array = array_reverse($array, TRUE);
+                $array[$key] = $val;
+                $array = array_reverse($array, TRUE);
+
+                return $array;
+        }
+
+} // End arr

trunk/system/helpers/date.php

@@ -298 +298 @@
         {
                 // Default values
-                $time1  = max(0, (int) $time);
+                $time1  = max(0, (int) $time1);
                 $time2  = ($time2 === FALSE) ? time() : max(0, (int) $time2);
 

trunk/system/helpers/form.php

@@ -141 +141 @@
 
                 // Form elements should have the same id as name
-                if ( ! isset($data['id']))
+                if ( ! isset($data['id']) AND strpos($data['name'], '[') === FALSE)
                 {
                         $data['id'] = $data['name'];
@@ -444 +444 @@
                         }
 
-                        $data = array
-                        (
-                                'for' => $data
-                        );
+                        $data = empty($data) ? array() : array('for' => $data);
                 }
 

trunk/system/libraries/ORM.php

@@ -229 +229 @@
 
                         // Find requested objects
-                        return isset($all) ? $this->find_all() : $this->find();
+                        return isset($all) ? $this->load_result(TRUE) : $this->find();
                 }
 
@@ -259 +259 @@
                         }
 
-                        return $model->find_all();
+                        return $model->load_result(TRUE);
                 }
 
@@ -619 +619 @@
                                 $class = get_class($this);
 
+                                $result = $result->result_array();
+
                                 $array = array();
-                                foreach($result->result_array() as $row)
+                                foreach($result as $row)
                                 {
                                         // Add object to the array

trunk/system/libraries/drivers/Database_Mysql.php

@@ -393 +393 @@
                 }
 
-                while ($row = $fetch($this->result, $type))
-                {
-                        $rows[] = $row;
-                }
-
-                return $rows;
+                if (mysql_num_rows($this->result))
+                {
+                        // Reset the pointer location to make sure things work properly
+                        mysql_data_seek($this->result, 0);
+
+                        while ($row = $fetch($this->result, $type))
+                        {
+                                $rows[] = $row;
+                        }
+                }
+
+                return isset($rows) ? $rows : array();
         }
 
@@ -476 +482 @@
         {
                 // Check to see if the requested offset exists.
-                if (!$this->offsetExists($offset))
+                if ( ! $this->offsetExists($offset))
                         return FALSE;