Skip to content

Commit c940d57

Browse files
committed
Merge branch '2.1' into 2.2
2 parents cfb23fa + f83fcc6 commit c940d57

File tree

2 files changed

+18
-34
lines changed

2 files changed

+18
-34
lines changed

CHANGELOG.md

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
## [2.1.3](https://github.com/slimkit/plus/compare/2.1.2...2.1.3) (2018-12-03)
1+
## [2.1.4](https://github.com/slimkit/plus/compare/2.0.8...2.1.4) (2018-12-25)
2+
3+
4+
### Bug Fixes
5+
6+
* 修复错误的控制器命名 ([7ce5496](https://github.com/slimkit/plus/commit/7ce5496))
7+
* 修复功能错误提交远端,导致开源库功能丢失问题 ([cf83719](https://github.com/slimkit/plus/commit/cf83719))
8+
* **核心:** 修复导出打赏清单存在圈子帖子打赏导致到处错误 fix [#497](https://github.com/slimkit/plus/issues/497) ([097e6fd](https://github.com/slimkit/plus/commit/097e6fd))
9+
* **资讯:** 修复打赏清单列表来源为“资讯”出现错别字 fix [#498](https://github.com/slimkit/plus/issues/498) ([a8a4a00](https://github.com/slimkit/plus/commit/a8a4a00))
10+
* **资讯:** 修复资讯后台筛选指定所属类别无效问题 fix[#495](https://github.com/slimkit/plus/issues/495) ([9e3078b](https://github.com/slimkit/plus/commit/9e3078b))
11+
12+
13+
14+
## [2.0.8](https://github.com/slimkit/plus/compare/2.1.2...2.0.8) (2018-12-03)
215

316

417
### Bug Fixes
@@ -22,32 +35,3 @@
2235

2336

2437

25-
## [2.1.2](https://github.com/slimkit/plus/compare/2.0.7...2.1.2) (2018-11-07)
26-
27-
28-
29-
# [2.1.0](https://github.com/slimkit/plus/compare/2.0.4...2.1.0) (2018-10-22)
30-
31-
32-
### Bug Fixes
33-
34-
* 修复核心加载中间件错误 ([55ad69e](https://github.com/slimkit/plus/commit/55ad69e))
35-
* **news:** 修复投稿时输入错误密码依然能够投稿成功! ([c64e400](https://github.com/slimkit/plus/commit/c64e400)), closes [zhiyicx/thinksns-plus-android#2396](https://github.com/zhiyicx/thinksns-plus-android/issues/2396) [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
36-
37-
38-
### Features
39-
40-
* 启动接口返回是否需要用户输入支付时密码标识 ([058c852](https://github.com/slimkit/plus/commit/058c852)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
41-
* 新增打赏用户需要验证用户密码 ([e873876](https://github.com/slimkit/plus/commit/e873876)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
42-
* 验证用户密码中间件允许后台开关 ([7ba0df1](https://github.com/slimkit/plus/commit/7ba0df1))
43-
* 增加支付节点验证用户密码 ([a50d0a4](https://github.com/slimkit/plus/commit/a50d0a4)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
44-
* **admin:** 增加验证用户支付时密码开关功能 ([02d8ec0](https://github.com/slimkit/plus/commit/02d8ec0)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
45-
* **core:** 核心 FileWith 允许批量复制属性 ([ad2ff46](https://github.com/slimkit/plus/commit/ad2ff46))
46-
* **feeds:** 增加打赏动态验证用户密码 ([b82139c](https://github.com/slimkit/plus/commit/b82139c)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
47-
* **feeds:** 增加动态和动态评论置顶申请验证用户密码 ([0a219db](https://github.com/slimkit/plus/commit/0a219db))
48-
* **news:** 增加资讯打赏验证密码 ([885dbf1](https://github.com/slimkit/plus/commit/885dbf1))
49-
* **news:** 增加资讯和资讯评论申请置顶验证用户密码 ([8b89b39](https://github.com/slimkit/plus/commit/8b89b39)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
50-
* **news:** 增加资讯投稿验证用户密码 ([f7b3f9b](https://github.com/slimkit/plus/commit/f7b3f9b)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
51-
52-
53-

app/Http/Controllers/APIs/V2/CurrentUserController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ public function update(Request $request, ResponseFactoryContract $response)
8888
if ($target) {
8989
return $response->json(['name' => ['用户名已被使用']], 422);
9090
}
91-
92-
foreach ($request->only(['name', 'bio', 'sex', 'location', 'avatar', 'bg']) as $key => $value) {
93-
if (! is_null($value)) {
94-
$user->$key = $value;
91+
$fields = ['name', 'bio', 'sex', 'location', 'avatar', 'bg'];
92+
foreach ($fields as $field) {
93+
if ($request->request->has($field)) {
94+
$user->{$field} = $request->input($field);
9595
}
9696
}
9797

0 commit comments

Comments
 (0)