0
@@ -969,14 +969,29 @@ abstract class CmsObjectRelationalMapping extends CmsObject implements ArrayAcce
0
    *
0
    * @param array Reference to the hash for this record that came from the database
0
    * @param mixed Reference to the object we should fill
0
-	 * @return The object we filled (php4 doesn't seem to handle the reference right)
0
+	 * @return The object we filled
0
    */
0
   function fill_object(&$resulthash, &$object)
0
   {
0
+		$db = cms_db();
0
+		$fields = $this->get_columns_in_table(); //Relax, it's cached
0
+
0
     foreach ($resulthash as $k=>$v)
0
     {
0
+			$datetime = false;
0
+			if (array_key_exists($k, $fields) && strtolower($fields[$k]->type) == 'datetime')
0
+				$datetime = true;
0
+
0
       if (array_key_exists($k, $this->field_maps)) $k = $this->field_maps[$k];
0
-			$object->params[$k] = $v;
0
+
0
+			if ($datetime)
0
+			{
0
+				$object->params[$k] = new CmsDateTime($v);
0
+			}
0
+			else
0
+			{
0
+				$object->params[$k] = $v;
0
+			}
0
     }
0
     
0
     $this->dirty = false;