Fix: New revision is created but no changes were made #6062

2026-05-04 18:08:46 +03:00 · 2026-03-19 14:49:14 +01:00
32 changed files with 84 additions and 275 deletions
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -533,4 +533,3 @@ JanDziaslo :: Polish
 Charllys Fernandes (CharllysFernandes) :: Portuguese, Brazilian
 Ilgiz Zigangirov (inov8) :: Russian
 Max Israelsson (Blezie) :: Swedish
-Skiddybison5924 (chris-devel0per) :: German
--- a/.gitignore
+++ b/.gitignore
@@ -8,10 +8,10 @@ Homestead.yaml
 .idea
 npm-debug.log
 yarn-error.log
-/public/dist/*.map
+/public/dist
 /public/plugins
-/public/css/*.map
-/public/js/*.map
+/public/css
+/public/js
 /public/bower
 /public/build/
 /public/favicon.ico
--- a/app/Access/Controllers/RegisterController.php
+++ b/app/Access/Controllers/RegisterController.php
@@ -48,7 +48,8 @@ class RegisterController extends Controller
    public function postRegister(Request $request)
    {
        $this->registrationService->ensureRegistrationAllowed();
-        $userData = $this->validator($request->all())->validate();
+        $this->validator($request->all())->validate();
+        $userData = $request->all();

        try {
            $user = $this->registrationService->registerUser($userData);
--- a/app/Access/RegistrationService.php
+++ b/app/Access/RegistrationService.php
@@ -83,7 +83,7 @@ class RegistrationService
        // Email restriction
        $this->ensureEmailDomainAllowed($userEmail);

-        // Ensure the user does not already exist
+        // Ensure user does not already exist
        $alreadyUser = !is_null($this->userRepo->getByEmail($userEmail));
        if ($alreadyUser) {
            throw new UserRegistrationException(trans('errors.error_user_exists_different_creds', ['email' => $userEmail]), '/login');
@@ -99,7 +99,7 @@ class RegistrationService
        $newUser = $this->userRepo->createWithoutActivity($userData, $emailConfirmed);
        $newUser->attachDefaultRole();

-        // Assign a social account if given
+        // Assign social account if given
        if ($socialAccount) {
            $newUser->socialAccounts()->save($socialAccount);
        }
@@ -107,7 +107,7 @@ class RegistrationService
        Activity::add(ActivityType::AUTH_REGISTER, $socialAccount ?? $newUser);
        Theme::dispatch(ThemeEvents::AUTH_REGISTER, $authSystem, $newUser);

-        // Start the email confirmation flow if required
+        // Start email confirmation flow if required
        if ($this->emailConfirmationService->confirmationRequired() && !$emailConfirmed) {
            $newUser->save();

--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -118,27 +118,29 @@ class PageRepo
     */
    public function update(Page $page, array $input): Page
    {
-        // Hold the old details to compare later
+        // Hold the old details to compare later.
        $oldName = $page->name;
        $oldHtml = $page->html;
        $oldMarkdown = $page->markdown;

        $this->updateTemplateStatusAndContentFromInput($page, $input);
-        $page = $this->baseRepo->update($page, $input);

-        // Update with new details
-        $page->revision_count++;
-        $page->save();
-
-        // Remove all update drafts for this user and page.
-        $this->revisionRepo->deleteDraftsForCurrentUser($page);
-
-        // Save a revision after updating
+        // Values used to determine if a change has been made.
        $summary = trim($input['summary'] ?? '');
-        $htmlChanged = isset($input['html']) && $input['html'] !== $oldHtml;
+        $htmlChanged = isset($page->html) && $page->html !== $oldHtml;
        $nameChanged = isset($input['name']) && $input['name'] !== $oldName;
-        $markdownChanged = isset($input['markdown']) && $input['markdown'] !== $oldMarkdown;
+        $markdownChanged = isset($page->markdown) && $page->markdown !== $oldMarkdown;
+
+        // Update with new details, only if the page really changed.
        if ($htmlChanged || $nameChanged || $markdownChanged || $summary) {
+            $page = $this->baseRepo->update($page, $input);
+
+            $page->revision_count++;
+            $page->save();
+
+            // Remove all update drafts for this user and page.
+            $this->revisionRepo->deleteDraftsForCurrentUser($page);
+
            $this->revisionRepo->storeNewForPage($page, $summary);
        }

--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.373.7",
+            "version": "3.373.3",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "4402bd10f913e66b7271f44466be8d5ba6c9146e"
+                "reference": "d23edc4cf9cd81cb98b5beb9c1fb3737f535b1e5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4402bd10f913e66b7271f44466be8d5ba6c9146e",
-                "reference": "4402bd10f913e66b7271f44466be8d5ba6c9146e",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d23edc4cf9cd81cb98b5beb9c1fb3737f535b1e5",
+                "reference": "d23edc4cf9cd81cb98b5beb9c1fb3737f535b1e5",
                "shasum": ""
            },
            "require": {
@@ -153,9 +153,9 @@
            "support": {
                "forum": "https://github.com/aws/aws-sdk-php/discussions",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.373.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.373.3"
            },
-            "time": "2026-03-20T18:14:19+00:00"
+            "time": "2026-03-16T18:15:27+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@@ -1801,16 +1801,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v12.55.1",
+            "version": "v12.54.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "6d9185a248d101b07eecaf8fd60b18129545fd33"
+                "reference": "325497463e7599cd14224c422c6e5dd2fe832868"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/6d9185a248d101b07eecaf8fd60b18129545fd33",
-                "reference": "6d9185a248d101b07eecaf8fd60b18129545fd33",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/325497463e7599cd14224c422c6e5dd2fe832868",
+                "reference": "325497463e7599cd14224c422c6e5dd2fe832868",
                "shasum": ""
            },
            "require": {
@@ -1926,7 +1926,7 @@
                "orchestra/testbench-core": "^10.9.0",
                "pda/pheanstalk": "^5.0.6|^7.0.0",
                "php-http/discovery": "^1.15",
-                "phpstan/phpstan": "^2.1.41",
+                "phpstan/phpstan": "^2.0",
                "phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1",
                "predis/predis": "^2.3|^3.0",
                "resend/resend-php": "^0.10.0|^1.0",
@@ -2019,20 +2019,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2026-03-18T14:28:59+00:00"
+            "time": "2026-03-10T20:25:56+00:00"
        },
        {
            "name": "laravel/prompts",
-            "version": "v0.3.15",
+            "version": "v0.3.14",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/prompts.git",
-                "reference": "4bb8107ec97651fd3f17f897d6489dbc4d8fb999"
+                "reference": "9f0e371244eedfe2ebeaa72c79c54bb5df6e0176"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/4bb8107ec97651fd3f17f897d6489dbc4d8fb999",
-                "reference": "4bb8107ec97651fd3f17f897d6489dbc4d8fb999",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/9f0e371244eedfe2ebeaa72c79c54bb5df6e0176",
+                "reference": "9f0e371244eedfe2ebeaa72c79c54bb5df6e0176",
                "shasum": ""
            },
            "require": {
@@ -2076,9 +2076,9 @@
            "description": "Add beautiful and user-friendly forms to your command-line applications.",
            "support": {
                "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.15"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.14"
            },
-            "time": "2026-03-17T13:45:17+00:00"
+            "time": "2026-03-01T09:02:38+00:00"
        },
        {
            "name": "laravel/serializable-closure",
@@ -2281,16 +2281,16 @@
        },
        {
            "name": "league/commonmark",
-            "version": "2.8.2",
+            "version": "2.8.1",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "59fb075d2101740c337c7216e3f32b36c204218b"
+                "reference": "84b1ca48347efdbe775426f108622a42735a6579"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/59fb075d2101740c337c7216e3f32b36c204218b",
-                "reference": "59fb075d2101740c337c7216e3f32b36c204218b",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/84b1ca48347efdbe775426f108622a42735a6579",
+                "reference": "84b1ca48347efdbe775426f108622a42735a6579",
                "shasum": ""
            },
            "require": {
@@ -2384,7 +2384,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-03-19T13:16:38+00:00"
+            "time": "2026-03-05T21:37:03+00:00"
        },
        {
            "name": "league/config",
@@ -4027,16 +4027,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.50",
+            "version": "3.0.49",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "aa6ad8321ed103dc3624fb600a25b66ebf78ec7b"
+                "reference": "6233a1e12584754e6b5daa69fe1289b47775c1b9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/aa6ad8321ed103dc3624fb600a25b66ebf78ec7b",
-                "reference": "aa6ad8321ed103dc3624fb600a25b66ebf78ec7b",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/6233a1e12584754e6b5daa69fe1289b47775c1b9",
+                "reference": "6233a1e12584754e6b5daa69fe1289b47775c1b9",
                "shasum": ""
            },
            "require": {
@@ -4117,7 +4117,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.50"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.49"
            },
            "funding": [
                {
@@ -4133,7 +4133,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-03-19T02:57:58+00:00"
+            "time": "2026-01-27T09:17:28+00:00"
        },
        {
            "name": "pragmarx/google2fa",
@@ -5154,22 +5154,22 @@
        },
        {
            "name": "socialiteproviders/manager",
-            "version": "4.9.2",
+            "version": "v4.8.1",
            "source": {
                "type": "git",
                "url": "https://github.com/SocialiteProviders/Manager.git",
-                "reference": "35372dc62787e61e91cfec73f45fd5d5ae0f8891"
+                "reference": "8180ec14bef230ec2351cff993d5d2d7ca470ef4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/35372dc62787e61e91cfec73f45fd5d5ae0f8891",
-                "reference": "35372dc62787e61e91cfec73f45fd5d5ae0f8891",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/8180ec14bef230ec2351cff993d5d2d7ca470ef4",
+                "reference": "8180ec14bef230ec2351cff993d5d2d7ca470ef4",
                "shasum": ""
            },
            "require": {
-                "illuminate/support": "^11.0 || ^12.0 || ^13.0",
+                "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
                "laravel/socialite": "^5.5",
-                "php": "^8.2"
+                "php": "^8.1"
            },
            "require-dev": {
                "mockery/mockery": "^1.2",
@@ -5224,7 +5224,7 @@
                "issues": "https://github.com/socialiteproviders/manager/issues",
                "source": "https://github.com/socialiteproviders/manager"
            },
-            "time": "2026-03-18T22:13:24+00:00"
+            "time": "2025-02-24T19:33:30+00:00"
        },
        {
            "name": "socialiteproviders/microsoft-azure",
@@ -9169,11 +9169,11 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.42",
+            "version": "2.1.41",
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1279e1ce86ba768f0780c9d889852b4e02ff40d0",
-                "reference": "1279e1ce86ba768f0780c9d889852b4e02ff40d0",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a2eae8f20856b3afe74bf1f9726ce8c11438e300",
+                "reference": "a2eae8f20856b3afe74bf1f9726ce8c11438e300",
                "shasum": ""
            },
            "require": {
@@ -9218,7 +9218,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-03-17T14:58:32+00:00"
+            "time": "2026-03-16T18:24:10+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
--- a/dev/checksums/vendor
+++ b/dev/checksums/vendor
@@ -1 +1 @@
-e23b5dd20fcaa1ba71ecc9e992c96003c73d7c22d85b024003bca3f9b7ac25d0
+22e02ee72d21ff719c1073abbec8302f8e2096ba6d072e133051064ed24b45b1
--- a/dev/docs/development.md
+++ b/dev/docs/development.md
@@ -37,7 +37,7 @@ We use tools to manage code standards and formatting within the project. If subm

 ### PHP

-PHP code standards are managed by [using PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer).
+PHP code standards are managed by [using PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer).
 Static analysis is in place using [PHPStan](https://phpstan.org/) & [Larastan](https://github.com/nunomaduro/larastan).
 The below commands can be used to utilise these tools:

--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -104,7 +104,7 @@ return [
    'sort_rule_op_chapters_first' => 'Kapitoly jako první',
    'sort_rule_op_chapters_last' => 'Kapitoly jako poslední',
    'sorting_page_limits' => 'Počet zobrazených položek na stránce',
-    'sorting_page_limits_desc' => 'Nastavte, kolik položek se má zobrazit na stránce v různých seznamech na webu. Obvykle bude nižší počet výkonnější, zatímco vyšší počet eliminuje nutnost proklikávat se několika stránkami. Doporučuje se použít násobek čísla 6.',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',

    // Maintenance settings
    'maint' => 'Údržba',
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -109,7 +109,7 @@ return [
    'import_zip_cant_read' => 'ZIP-Datei konnte nicht gelesen werden.',
    'import_zip_cant_decode_data' => 'ZIP data.json konnte nicht gefunden und dekodiert werden.',
    'import_zip_no_data' => 'ZIP-Datei Daten haben kein erwartetes Buch, Kapitel oder Seiteninhalt.',
-    'import_zip_data_too_large' => 'Der Inhalt der ZIP data.json überschreitet die maximale Dateigröße der Anwendung.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
    'import_validation_failed' => 'ZIP Import konnte mit Fehlern nicht validiert werden:',
    'import_zip_failed_notification' => 'Importieren der ZIP-Datei fehlgeschlagen.',
    'import_perms_books' => 'Ihnen fehlt die erforderliche Berechtigung, um Bücher zu erstellen.',
@@ -125,7 +125,7 @@ return [
    'api_incorrect_token_secret' => 'Das Kennwort für das angegebene API-Token ist falsch',
    'api_user_no_api_permission' => 'Der Besitzer des verwendeten API-Tokens hat keine Berechtigung für API-Aufrufe',
    'api_user_token_expired' => 'Das verwendete Autorisierungstoken ist abgelaufen',
-    'api_cookie_auth_only_get' => 'Nur GET Anfragen sind erlaubt, wenn die API mit Cookie-basierter Authentifizierung verwendet wird',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',

    // Settings & Maintenance
    'maintenance_test_email_failure' => 'Fehler beim Versenden einer Test E-Mail:',
--- a/lang/de/notifications.php
+++ b/lang/de/notifications.php
@@ -11,8 +11,8 @@ return [
    'updated_page_subject' => 'Aktualisierte Seite: :pageName',
    'updated_page_intro' => 'Eine Seite wurde in :appName aktualisiert:',
    'updated_page_debounce' => 'Um eine Flut von Benachrichtigungen zu vermeiden, werden Sie für eine gewisse Zeit keine Benachrichtigungen für weitere Bearbeitungen dieser Seite durch denselben Bearbeiter erhalten.',
-    'comment_mention_subject' => 'Sie wurden in einem Kommentar auf der Seite :pageName erwähnt',
-    'comment_mention_intro' => 'Sie wurden in einem Kommentar zu :appName: erwähnt',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',

    'detail_page_name' => 'Name der Seite:',
    'detail_page_path' => 'Seitenpfad:',
--- a/lang/de/preferences.php
+++ b/lang/de/preferences.php
@@ -23,7 +23,7 @@ return [
    'notifications_desc' => 'Legen Sie fest, welche E-Mail-Benachrichtigungen Sie erhalten, wenn bestimmte Aktivitäten im System durchgeführt werden.',
    'notifications_opt_own_page_changes' => 'Benachrichtigung bei Änderungen an eigenen Seiten',
    'notifications_opt_own_page_comments' => 'Benachrichtigung bei Kommentaren an eigenen Seiten',
-    'notifications_opt_comment_mentions' => 'Bei Erwähnung mich benachrichtigen',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
    'notifications_opt_comment_replies' => 'Bei Antworten auf meine Kommentare benachrichtigen',
    'notifications_save' => 'Einstellungen speichern',
    'notifications_update_success' => 'Benachrichtigungseinstellungen wurden aktualisiert!',
--- a/lang/de_informal/errors.php
+++ b/lang/de_informal/errors.php
@@ -109,7 +109,7 @@ return [
    'import_zip_cant_read' => 'ZIP-Datei konnte nicht gelesen werden.',
    'import_zip_cant_decode_data' => 'Konnte Inhalt der data.json im ZIP nicht finden und dekodieren.',
    'import_zip_no_data' => 'ZIP-Datei hat kein erwartetes Buch, Kapitel oder Seiteninhalt.',
-    'import_zip_data_too_large' => 'Der Inhalt der ZIP data.json überschreitet die maximale Dateigröße der Anwendung.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
    'import_validation_failed' => 'ZIP Import konnte aufgrund folgender Fehler nicht validiert werden:',
    'import_zip_failed_notification' => 'Importieren der ZIP-Datei fehlgeschlagen.',
    'import_perms_books' => 'Dir fehlt die erforderliche Berechtigung, um Bücher zu erstellen.',
@@ -125,7 +125,7 @@ return [
    'api_incorrect_token_secret' => 'Das für den API-Token angegebene geheime Token ist falsch',
    'api_user_no_api_permission' => 'Der Besitzer des verwendeten API-Token hat keine Berechtigung für API-Aufrufe',
    'api_user_token_expired' => 'Das verwendete Autorisierungs-Token ist abgelaufen',
-    'api_cookie_auth_only_get' => 'Nur GET Anfragen sind erlaubt, wenn die API mit Cookie-basierter Authentifizierung verwendet wird',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',

    // Settings & Maintenance
    'maintenance_test_email_failure' => 'Fehler beim Senden einer Test E-Mail:',
--- a/lang/de_informal/notifications.php
+++ b/lang/de_informal/notifications.php
@@ -11,8 +11,8 @@ return [
    'updated_page_subject' => 'Aktualisierte Seite: :pageName',
    'updated_page_intro' => 'Eine Seite wurde in :appName aktualisiert:',
    'updated_page_debounce' => 'Um eine Flut von Benachrichtigungen zu vermeiden, wirst du für eine gewisse Zeit keine Benachrichtigungen für weitere Bearbeitungen dieser Seite durch denselben Bearbeiter erhalten.',
-    'comment_mention_subject' => 'Sie wurden in einem Kommentar auf der Seite :pageName erwähnt',
-    'comment_mention_intro' => 'Sie wurden in einem Kommentar zu :appName: erwähnt',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',

    'detail_page_name' => 'Seitenname:',
    'detail_page_path' => 'Seitenpfad:',
--- a/lang/de_informal/preferences.php
+++ b/lang/de_informal/preferences.php
@@ -23,7 +23,7 @@ return [
    'notifications_desc' => 'Lege fest, welche E-Mail-Benachrichtigungen du erhältst, wenn bestimmte Aktivitäten im System durchgeführt werden.',
    'notifications_opt_own_page_changes' => 'Benachrichtigung bei Änderungen an eigenen Seiten',
    'notifications_opt_own_page_comments' => 'Benachrichtigung bei Kommentaren an eigenen Seiten',
-    'notifications_opt_comment_mentions' => 'Bei Erwähnung mich benachrichtigen',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
    'notifications_opt_comment_replies' => 'Bei Antworten auf meine Kommentare benachrichtigen',
    'notifications_save' => 'Einstellungen speichern',
    'notifications_update_success' => 'Benachrichtigungseinstellungen wurden aktualisiert!',
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -104,7 +104,7 @@ return [
    'sort_rule_op_chapters_first' => 'Chapitres en premier',
    'sort_rule_op_chapters_last' => 'Chapitres en dernier',
    'sorting_page_limits' => 'Limite d\'affichage par page',
-    'sorting_page_limits_desc' => 'Définissez le nombre d’éléments à afficher par page dans les différentes listes du système. En général, un nombre plus faible offre de meilleures performances, tandis qu’un nombre plus élevé réduit le besoin de naviguer entre plusieurs pages. Il est recommandé d’utiliser un multiple de 6.',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',

    // Maintenance settings
    'maint' => 'Maintenance',
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -104,7 +104,7 @@ return [
    'sort_rule_op_chapters_first' => 'チャプタを最初に',
    'sort_rule_op_chapters_last' => 'チャプタを最後に',
    'sorting_page_limits' => 'ページング表示制限',
-    'sorting_page_limits_desc' => 'システム内の各種リストで1ページに表示するアイテム数を設定します。 通常、少ない数に設定するとパフォーマンスが向上し、多い数に設定するとページの移動操作が少なくなります。6 の倍数に設定することをお勧めします。',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',

    // Maintenance settings
    'maint' => 'メンテナンス',
--- a/public/dist/app.js
+++ b/public/dist/app.js
--- a/public/dist/code.js
+++ b/public/dist/code.js
--- a/public/dist/export-styles.css
+++ b/public/dist/export-styles.css
--- a/public/dist/legacy-modes.js
+++ b/public/dist/legacy-modes.js
--- a/public/dist/markdown.js
+++ b/public/dist/markdown.js
--- a/public/dist/styles.css
+++ b/public/dist/styles.css
--- a/public/dist/wysiwyg.js
+++ b/public/dist/wysiwyg.js
--- a/readme.md
+++ b/readme.md
@@ -178,7 +178,7 @@ Note: This is not an exhaustive list of all libraries and projects that would be
 * [phpseclib](https://github.com/phpseclib/phpseclib) - _[MIT](https://github.com/phpseclib/phpseclib/blob/master/LICENSE)_
 * [Clockwork](https://github.com/itsgoingd/clockwork) - _[MIT](https://github.com/itsgoingd/clockwork/blob/master/LICENSE)_
 * [PHPStan](https://phpstan.org/) & [Larastan](https://github.com/nunomaduro/larastan) - _[MIT](https://github.com/phpstan/phpstan/blob/master/LICENSE) and [MIT](https://github.com/nunomaduro/larastan/blob/master/LICENSE.md)_
-* [PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer) - _[BSD 3-Clause](https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt)_
+* [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) - _[BSD 3-Clause](https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt)_
 * [JakeArchibald/IDB-Keyval](https://github.com/jakearchibald/idb-keyval) - _[Apache-2.0](https://github.com/jakearchibald/idb-keyval/blob/main/LICENCE)_
 * [HTML Purifier](https://github.com/ezyang/htmlpurifier) and [htmlpurifier-html5](https://github.com/xemlock/htmlpurifier-html5) - _[LGPL-2.1](https://github.com/ezyang/htmlpurifier/blob/master/LICENSE) and [MIT](https://github.com/xemlock/htmlpurifier-html5/blob/master/LICENSE)_

--- a/resources/js/wysiwyg-tinymce/plugins-details.js
+++ b/resources/js/wysiwyg-tinymce/plugins-details.js
@@ -19,8 +19,6 @@ function setSummary(editor, summaryContent) {
        }
        summary.textContent = summaryContent;
    });
-
-    editor.selection.select(details);
 }

 /**
@@ -204,12 +202,8 @@ function register(editor) {
    });

    editor.on('dblclick', event => {
-        const domElClass = event?.target?.ownerDocument?.defaultView?.HTMLDetailsElement;
-        if (domElClass && event.target instanceof domElClass && getSelectedDetailsBlock(editor)) {
-            showDetailLabelEditWindow(editor);
-            event.preventDefault();
-            event.stopPropagation();
-        }
+        if (!getSelectedDetailsBlock(editor) || event.target.closest('doc-root')) return;
+        showDetailLabelEditWindow(editor);
    });

    editor.ui.registry.addButton('toggledetails', {
--- a/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
@@ -45,7 +45,6 @@ import {LineBreakNode} from './nodes/LexicalLineBreakNode';
 import {ParagraphNode} from './nodes/LexicalParagraphNode';
 import {RootNode} from './nodes/LexicalRootNode';
 import {TabNode} from './nodes/LexicalTabNode';
-import {EditorUiContext} from "../../ui/framework/core";

 export type Spread<T1, T2> = Omit<T2, keyof T1> & T1;

@@ -622,8 +621,6 @@ export class LexicalEditor {
  _editable: boolean;
  /** @internal */
  _blockCursorElement: null | HTMLDivElement;
-  /** @internal */
-  _context: null | EditorUiContext;

  /** @internal */
  constructor(
@@ -685,7 +682,6 @@ export class LexicalEditor {
    this._headless = parentEditor !== null && parentEditor._headless;
    this._window = null;
    this._blockCursorElement = null;
-    this._context = null;
  }

  /**
@@ -1289,21 +1285,6 @@ export class LexicalEditor {
      triggerListeners('editable', this, true, editable);
    }
  }
-
-  /**
-   * Set the UI context that this editor is intended to be part of.
-   */
-  setUiContext(context: EditorUiContext) {
-    this._context = context;
-  }
-
-  /**
-   * Get the UI context that this editor is considered to be part of.
-   */
-  getUiContext(): EditorUiContext|null {
-    return this._context;
-  }
-
  /**
   * Returns a JSON-serializable javascript object NOT a JSON string.
   * You still must call JSON.stringify (or something else) to turn the
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -9,7 +9,6 @@ import {
 } from 'lexical';

 import {extractDirectionFromElement} from "lexical/nodes/common";
-import {$showDetailsForm} from "../../ui/defaults/forms/objects";

 export type SerializedDetailsNode = Spread<{
    id: string;
@@ -91,16 +90,6 @@ export class DetailsNode extends ElementNode {
            });
        });

-        summary.addEventListener('dblclick', event => {
-            event.preventDefault();
-            const uiContext = _editor.getUiContext();
-            if (uiContext) {
-                _editor.read(() => {
-                    $showDetailsForm(this, uiContext);
-                });
-            }
-        });
-
        el.append(summary);

        return el;
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -221,7 +221,7 @@ export const detailsEditLabel: EditorButtonDefinition = {
            if ($isDetailsNode(details)) {
                $showDetailsForm(details, context);
            }
-        });
+        })
    },
    isActive(selection: BaseSelection | null): boolean {
        return false;
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -29,7 +29,7 @@ export class EditorUIManager {
    setContext(context: EditorUiContext) {
        this.context = context;
        this.setupEventListeners();
-        this.setupEditor(context.editor, context);
+        this.setupEditor(context.editor);
    }

    getContext(): EditorUiContext {
@@ -256,10 +256,7 @@ export class EditorUIManager {
        }
    }

-    protected setupEditor(editor: LexicalEditor, context: EditorUiContext) {
-        // Pass the context to the editor
-        editor.setUiContext(context);
-
+    protected setupEditor(editor: LexicalEditor) {
        // Register our DOM decorate listener with the editor
        const domDecorateListener: DecoratorListener<EditorDecoratorAdapter> = (decorators: Record<NodeKey, EditorDecoratorAdapter>) => {
            editor.getEditorState().read(() => {
--- a/tests/Auth/RegistrationTest.php
+++ b/tests/Auth/RegistrationTest.php
@@ -188,30 +188,6 @@ class RegistrationTest extends TestCase
        $resp->assertSee('The password must be at least 8 characters.');
    }

-    public function test_registration_input_filtered_to_validated_input()
-    {
-        $this->setSettings(['registration-enabled' => 'true']);
-        $roleIds = Role::all()->pluck('id')->toArray();
-
-        $resp = $this->post('/register', [
-            'name'     => 'Barry',
-            'email'    => 'barry@example.com',
-            'password' => 'superpassword',
-            'password_confirmation' => 'superpassword',
-            'external_auth_id' => 'ext5691284',
-            'roles' => $roleIds,
-        ]);
-
-        $resp->assertRedirect('/');
-
-        /** @var User $user */
-        $user = auth()->user();
-        $this->assertNotNull($user);
-        $this->assertFalse($user->isGuest());
-        $this->assertEmpty($user->external_auth_id);
-        $this->assertEquals(0, $user->roles()->count());
-    }
-
    public function test_registration_simple_honeypot_active()
    {
        $this->setSettings(['registration-enabled' => 'true']);
--- a/2
+++ b/2
@@ -1 +1 @@
-v26.03.2
+v26.01-dev