Opensearch: Fixed XML declaration when php short tags enabled

[bookstack] / app / Settings / SettingController.php

diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php
index ffdd7545e7837678a6328591c8aa502e9bcaa290..3b7ba74d58a8afc0342c59f04b12a3560c78dba8 100644 (file)
--- 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(),
         ]);
     }
 
@@ -52,16 +48,14 @@ class SettingController extends Controller
         ]);
 
         $store->storeFromUpdateRequest($request, $category);
-
         $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);
-        $this->showSuccessNotification(trans('settings.settings_save_success'));
 
         return redirect("/settings/{$category}");
     }
 
     protected function ensureCategoryExists(string $category): void
     {
-        if (!in_array($category, $this->settingCategories)) {
+        if (!view()->exists('settings.categories.' . $category)) {
             abort(404);
         }
     }