Browse Source

Update SettingsController

Daniel Supernault 3 năm trước cách đây
mục cha
commit
f363a3275a
1 tập tin đã thay đổi với 3 bổ sung1 xóa
  1. 3 1
      app/Http/Controllers/SettingsController.php

+ 3 - 1
app/Http/Controllers/SettingsController.php

@@ -257,7 +257,9 @@ class SettingsController extends Controller
 	public function mediaSettings(Request $request)
 	{
 		$setting = UserSetting::whereUserId($request->user()->id)->firstOrFail();
-		$compose = $setting->compose_settings ? json_decode($setting->compose_settings, true) : [
+		$compose = $setting->compose_settings ? (
+			is_string($setting->compose_settings) ? json_decode($setting->compose_settings, true) : $setting->compose_settings
+			) : [
 			'default_license' => null,
 			'media_descriptions' => false
 		];