X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/b9b500323947f30ce8e7b2e19287ddefc27c4edb..refs/pull/5689/head:/app/Settings/SettingController.php diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php index 6ecc2bd1d..3b7ba74d5 100644 --- a/app/Settings/SettingController.php +++ b/app/Settings/SettingController.php @@ -3,6 +3,7 @@ namespace BookStack\Settings; use BookStack\Activity\ActivityType; +use BookStack\App\AppVersion; use BookStack\Http\Controller; use BookStack\Users\Models\User; use Illuminate\Http\Request; @@ -26,12 +27,9 @@ class SettingController extends Controller $this->checkPermission('settings-manage'); $this->setPageTitle(trans('settings.settings')); - // Get application version - $version = trim(file_get_contents(base_path('version'))); - - return view('settings.' . $category, [ + return view('settings.categories.' . $category, [ 'category' => $category, - 'version' => $version, + 'version' => AppVersion::get(), 'guestUser' => User::getGuest(), ]); } @@ -57,8 +55,8 @@ class SettingController extends Controller protected function ensureCategoryExists(string $category): void { - if (!view()->exists('settings.' . $category)) { - abort(404, 'Category not found'); + if (!view()->exists('settings.categories.' . $category)) { + abort(404); } } }