Merge branch 'mergetopic' into 'master'

Merge topic.

See merge request 076/community/076Server!10

app/Http/Controllers/BoardController.php

@@ -901,7 +901,7 @@ class BoardController extends Controller {
     }
 
     public function mergeTopic(Request $request) { // /api/rpc/board/topic/merge
-        /* $check = $this->objAuth->checkLegit($request->username, $request->password);
+        $check = $this->objAuth->checkLegit($request->username, $request->password);
 
         if ($check == 0) {
             return 'Err!';
@@ -910,14 +910,22 @@ class BoardController extends Controller {
             $valid = $this->objAuth->getPermissions($request->username, $request->password);
 
             if ($valid['for_mergepost'] == 1) {
-                return DB::table('for_threads')
-                    ->where('id', $request->id)
+                DB::table('for_posts')
+                    ->where('top_id', $request->id)
                     ->update([
-                        'delete' => 0,
-                        'delreason' => ''
+                        'top_id' => $request->alt_id
                     ]);
+
+                DB::table('for_threads')
+                    ->where('id', $request->id)
+                    ->delete();
+
+                return 'Success!';
             }
-        } */
+            else {
+                return 'Permission denied.';
+            }
+        }
     }
 
     public function pinTopic(Request $request) { // /api/rpc/board/topic/pin