[Fmsystem-commits] [10798] Removed unnessesary specification of return type

[Torstein]

Revision: 10798
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10798
Author:   vator
Date:     2013-02-13 09:15:27 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
Removed unnessesary specification of return type

Modified Paths:
--------------
    trunk/controller/inc/class.socase.inc.php
    trunk/controller/inc/class.uicase.inc.php

Modified: trunk/controller/inc/class.socase.inc.php
===================================================================
--- trunk/controller/inc/class.socase.inc.php   2013-02-12 12:18:01 UTC (rev 
10797)
+++ trunk/controller/inc/class.socase.inc.php   2013-02-13 09:15:27 UTC (rev 
10798)
@@ -97,10 +97,9 @@
                 * 
                 * @param       $location_id location id
                 * @param       $location_item_id location item id
-                * @param $return_type return data as objects or as arrays
                 * @return array of case object represented as objects or arrays
                */
-               public function get_cases_by_message($location_id, 
$location_item_id, $return_type = "return_object")
+               public function get_cases_by_message($location_id, 
$location_item_id)
                {
                        $location_id            = (int) $location_id;
                        $location_item_id       = (int) $location_item_id;
@@ -124,14 +123,7 @@
                                
$case->set_modified_by($this->unmarshal($this->db->f('modified_by'), 'int'));
                                
$case->set_measurement($this->unmarshal($this->db->f('measurement'), 'string'));
                                
-                               if($return_type == "return_object")
-                               {
-                                       $cases_array[] = $case;
-                               }
-                               else
-                               {
-                                       $cases_array[] = $case->toArray();
-                               }
+                               $cases_array[] = $case;
                        }
 
                        return $cases_array;

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2013-02-12 12:18:01 UTC (rev 
10797)
+++ trunk/controller/inc/class.uicase.inc.php   2013-02-13 09:15:27 UTC (rev 
10798)
@@ -314,11 +314,11 @@
 
                                $interlink_data = array
                                (
-                                       'location1_id'          => 
$component_location_id,
+                                       'location1_id'      => 
$component_location_id,
                                        'location1_item_id' => $component_id,
-                                       'location2_id'          => 
$location_id_ticket,
+                                       'location2_id'      => 
$location_id_ticket,
                                        'location2_item_id' => 
$message_ticket_id,
-                                       'account_id'            => $user_id
+                                       'account_id'        => $user_id
                                );
 
                                execMethod('property.interlink.add', 
$interlink_data);