浏览代码

Update SettingsController

Daniel Supernault 3 年之前
父节点
当前提交
927a2a7d04
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      app/Http/Controllers/SettingsController.php

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

@@ -280,7 +280,7 @@ class SettingsController extends Controller
 		$uid = $request->user()->id;
 
 		$setting = UserSetting::whereUserId($uid)->firstOrFail();
-		$compose = json_decode($setting->compose_settings, true);
+		$compose = is_string($setting->compose_settings) ? json_decode($setting->compose_settings, true) : $setting->compose_settings;
 		$changed = false;
 
 		if($sync) {