* Fix bug.

2023-08-10 17:04:18 +08:00
parent 9b130a6b19
commit 225a632504
1 changed files with 1 additions and 6 deletions
@@ -2064,16 +2064,11 @@ class bugModel extends model
            ->andWhere('deleted')->eq(0)
            ->orderBy('id desc')
            ->beginIF($limit)->limit($limit)->fi()
-<<<<<<< Updated upstream
            ->fetchAll();

        foreach($data as $bug) $bugs[$bug->id] = $bug->id . ':' . $bug->title;
-        return $bugs;
-=======
-            ->fetchPairs();

-        return array('' => '') + $bugs;
->>>>>>> Stashed changes
+        return $bugs;
    }

    /**