🍣

Author: a-sync

application/controllers/Data.php

@@ -153,12 +153,12 @@ public function fix_data($tab = 'missing')
 
         if ($tab === 'verified') {
             $ops = $this->additional_data->get_ops_to_fix_data(true);
-            $ops_sus_suicides = array_column($this->additional_data->get_ops_sus_suicides(array_column($ops, 'id')), null, 'operation_id');
+            $ops_sus_suicides = $this->additional_data->get_ops_sus_suicides(array_column($ops, 'id'));
         } elseif ($tab === 'unverified') {
             $ops = $this->additional_data->get_ops_to_fix_data(false);
-            $ops_sus_suicides = array_column($this->additional_data->get_ops_sus_suicides(array_column($ops, 'id')), null, 'operation_id');
+            $ops_sus_suicides = $this->additional_data->get_ops_sus_suicides(array_column($ops, 'id'));
         } else { // sus
-            $ops_sus_suicides = array_column($this->additional_data->get_ops_sus_suicides(), null, 'operation_id');
+            $ops_sus_suicides = $this->additional_data->get_ops_sus_suicides();
             $op_ids_with_sus_suicides = array_keys($ops_sus_suicides);
             $ops = $this->additional_data->get_ops_to_fix_data(false, $op_ids_with_resolved_cmd, $op_ids_with_sus_suicides);
         }
@@ -442,7 +442,10 @@ public function events($op_id = null)
                 }
 
                 $op_events = $this->operations->get_events_by_id($op['id'], $entity_id, $player_id);
-                $op_sus_suicides = array_column($this->additional_data->get_ops_sus_suicides([$op['id']]), 'id');
+
+                $op_sus_suicides = array_reduce($this->additional_data->get_ops_sus_suicides([$op['id']]), function ($carry, $value) {
+                    return array_merge($carry, $value);
+                }, []);
 
                 $op_entities = $this->additional_data->get_op_entities($op['id']);
             } else {

application/models/Additional_data.php

@@ -660,7 +660,13 @@ public function get_ops_sus_suicides($op_ids = false)
             $this->db->where_in('killed.operation_id', $op_ids);
         }
 
-        return $this->db->get()->result_array();
+        $res = $this->db->get()->result_array();
+        $re = [];
+        foreach ($res as $r) {
+            $re[$r['operation_id']][] = $r['id'];
+        }
+
+        return $re;
     }
 
     public function get_op_sides($id)