X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ec775aec02c0887d5cf2dc23c938a75b7eaf67d2..refs/pull/5676/head:/app/Settings/SettingController.php diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php index bd55222f2..3b7ba74d5 100644 --- a/app/Settings/SettingController.php +++ b/app/Settings/SettingController.php @@ -3,14 +3,13 @@ namespace BookStack\Settings; use BookStack\Activity\ActivityType; +use BookStack\App\AppVersion; use BookStack\Http\Controller; use BookStack\Users\Models\User; use Illuminate\Http\Request; class SettingController extends Controller { - protected array $settingCategories = ['features', 'customization', 'registration']; - /** * Handle requests to the settings index path. */ @@ -28,13 +27,10 @@ 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, - 'guestUser' => User::getDefault(), + 'version' => AppVersion::get(), + 'guestUser' => User::getGuest(), ]); } @@ -59,7 +55,7 @@ class SettingController extends Controller protected function ensureCategoryExists(string $category): void { - if (!in_array($category, $this->settingCategories)) { + if (!view()->exists('settings.categories.' . $category)) { abort(404); } }