Merge branch 'develop'

AdKats · Jul 3, 2016 · 5b49a28 · 5b49a28
2 parents 4672ae9 + 9f64a27
commit 5b49a28
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/bfacp/Http/Controllers/Api/ReportsController.php b/app/bfacp/Http/Controllers/Api/ReportsController.php
@@ -71,7 +71,8 @@ public function putIndex()
 
                 if (Input::get('action') == 7) {
                     $maxDuration = Setting::where('setting_name',
-                        'Maximum Temp-Ban Duration Minutes')->where('server_id', 1)->pluck('setting_value');
+                        'Maximum Temp-Ban Duration Minutes')->where('server_id',
+                        $newRecord->server_id)->pluck('setting_value');
 
                     $duration = Input::get('extras.tban.duration', $maxDuration);