From 93a7bae30d2f28143caf5a1dafe65db64dfa0933 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 14 Sep 2019 12:28:22 +0800
Subject: [PATCH] Fix catching cipher exception

---
 app/Providers/AppServiceProvider.php     | 2 +-
 resources/misc/changelogs/en/5.0.0.md    | 1 +
 resources/misc/changelogs/zh_CN/5.0.0.md | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index d4318ecd..89406122 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -59,7 +59,7 @@ class AppServiceProvider extends ServiceProvider
         // @codeCoverageIgnoreStart
         try {
             $this->app->make('cipher');
-        } catch (ReflectionException $e) {
+        } catch (\Illuminate\Contracts\Container\BindingResolutionException $e) {
             throw new PrettyPageException(trans('errors.cipher.unsupported', ['cipher' => config('secure.cipher')]));
         }
 
diff --git a/resources/misc/changelogs/en/5.0.0.md b/resources/misc/changelogs/en/5.0.0.md
index 646e195b..7e970512 100644
--- a/resources/misc/changelogs/en/5.0.0.md
+++ b/resources/misc/changelogs/en/5.0.0.md
@@ -24,6 +24,7 @@
 - Add missing l10n text.
 - Fixed that model was reset after resetting skin previewing.
 - Fixed that error stack doesn't show paths from plugins when AJAX has an error.
+- Fixed that error page doesn't display when using an unsupported hash algorithm.
 
 ## Removed
 
diff --git a/resources/misc/changelogs/zh_CN/5.0.0.md b/resources/misc/changelogs/zh_CN/5.0.0.md
index adda9e67..b0877c1d 100644
--- a/resources/misc/changelogs/zh_CN/5.0.0.md
+++ b/resources/misc/changelogs/zh_CN/5.0.0.md
@@ -24,6 +24,7 @@
 - 补充部分缺失的语言文本
 - 重置皮肤预览后，皮肤模型也被重置的问题
 - AJAX 出现错误时，堆栈中不显示来自插件的部分
+- 当使用了不支持的密码加密算法时，错误页面没有正确显示的问题
 
 ## 移除