Merged
Conversation
added 14 commits
March 4, 2026 09:41
As this will stay like this in this version
As this is handled by assets hash now
So they don't throw sentry errors
Reviewer's GuideRemoves a wide range of deprecated features (Facebook/Twitter integration, legacy cookie bar, old HTML injection settings, and various deprecated helpers) and aligns templates, JS, and configuration to rely solely on the newer consent dialog and current settings APIs. Sequence diagram for page load with consent dialog and Google AnalyticssequenceDiagram
actor Visitor
participant Browser
participant Frontend_Page as Frontend_Page
participant ConsentDialog as Privacy_ConsentDialog
participant Settings as ModulesSettings
participant Cookie as CookieService
participant GA as GoogleAnalytics
Visitor->>Browser: Request page
Browser->>Frontend_Page: HTTP request
Frontend_Page->>Settings: get Core.show_consent_dialog
Settings-->>Frontend_Page: show_consent_dialog flag
Frontend_Page->>ConsentDialog: shouldDialogBeShown()
ConsentDialog->>Settings: get Core.show_consent_dialog
Settings-->>ConsentDialog: flag
ConsentDialog-->>Frontend_Page: boolean
Frontend_Page->>Browser: Render page with consent_dialog_template
Note over Browser,GA: Legacy cookie bar and cookieBarHide
Note over Browser,GA: logic have been removed
Browser->>GA: Initialize GoogleAnalytics
GA->>Settings: get Core.show_consent_dialog
Settings-->>GA: flag
GA->>Cookie: read consent cookies
Cookie-->>GA: consent state
GA-->>Browser: add GA script (with or without anonymize)
Browser-->>Visitor: Page rendered with consent dialog only
Flow diagram for cleaned up site HTML settings handlingflowchart LR
A[Backend_Settings_form_load] --> B[Read Core.site_html_head]
A --> C[Read Core.site_html_start_of_body]
A --> D[Read Core.site_html_end_of_body]
B --> E[Form_field site_html_head]
C --> F[Form_field site_html_start_of_body]
D --> G[Form_field site_html_end_of_body]
E --> H[Validate_form]
F --> H
G --> H
H --> I[Save Core.site_html_head]
H --> J[Save Core.site_html_start_of_body]
H --> K[Save Core.site_html_end_of_body]
I --> L[Frontend_Header_parse]
J --> M[Frontend_Header_parse]
K --> N[Frontend_Footer_parse]
L --> O[Assign siteHTMLHead]
M --> P[Assign siteHTMLStartOfBody]
N --> Q[Assign siteHTMLEndOfBody]
O --> R[Templates_render_head_using_siteHTMLHead]
P --> S[Templates_render_body_start_using_siteHTMLStartOfBody]
Q --> T[Templates_render_body_end_using_siteHTMLEndOfBody]
subgraph Removed_legacy_fallbacks_and_globals
U[Core.site_html_header]
V[Core.site_start_of_body_scripts]
W[Core.site_html_footer]
X[Template_globals_siteHTMLHeader]
Y[Template_globals_siteHTMLFooter]
end
U -. no_longer_used .- A
V -. no_longer_used .- A
W -. no_longer_used .- A
X -. removed .- R
Y -. removed .- T
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've found 1 issue, and left some high level feedback:
- In
Backend/Modules/Settings/Actions/Index::loadFormandvalidateForm, thesite_html_start_of_bodyandsite_html_end_of_bodysettings are now read and written redundantly (same key as value and fallback, and each key is set twice); consider simplifying these calls to a single read/write per key to avoid confusion. - You removed the Twitter settings UI and persistence in
validateForm, butloadFormstill adds thetwitter_site_namefield; it may be clearer to remove the field creation entirely if the setting is no longer supported.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In `Backend/Modules/Settings/Actions/Index::loadForm` and `validateForm`, the `site_html_start_of_body` and `site_html_end_of_body` settings are now read and written redundantly (same key as value and fallback, and each key is set twice); consider simplifying these calls to a single read/write per key to avoid confusion.
- You removed the Twitter settings UI and persistence in `validateForm`, but `loadForm` still adds the `twitter_site_name` field; it may be clearer to remove the field creation entirely if the setting is no longer supported.
## Individual Comments
### Comment 1
<location path="src/Backend/Modules/Settings/Actions/Index.php" line_range="483-484" />
<code_context>
- );
-
- // twitter settings
- /** @var \SpoonFormText $txtTwitterSiteName */
- $txtTwitterSiteName = $this->form->getField('twitter_site_name');
- if ($txtTwitterSiteName->isFilled()) {
- $this->get('fork.settings')->set(
</code_context>
<issue_to_address>
**question (bug_risk):** The `twitter_site_name` field is still created but is no longer persisted, which may lead to confusing behavior.
In `loadForm()` the `twitter_site_name` field is still added, but the save logic in `validateForm()` is removed. With the Twitter panel also gone from the Twig template, existing values will appear in the form but any edits won’t be persisted. Please either remove the form field entirely if Twitter config is being dropped, or keep the persistence logic (or a clear alternative) until the feature is fully removed to avoid this inconsistent behavior.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
tijsverkoyen
reviewed
Mar 4, 2026
src/Backend/Core/Js/ckfinder/core/connector/php/CKSource/CKFinder/Acl/Permission.php
Outdated
Show resolved
Hide resolved
src/Backend/Core/Js/ckfinder/core/connector/php/CKSource/CKFinder/Event/CopyFileEvent.php
Outdated
Show resolved
Hide resolved
src/Backend/Core/Js/ckfinder/core/connector/php/CKSource/CKFinder/Event/DeleteFileEvent.php
Outdated
Show resolved
Hide resolved
src/Backend/Core/Js/ckfinder/core/connector/php/CKSource/CKFinder/Event/DownloadFileEvent.php
Outdated
Show resolved
Hide resolved
src/Backend/Core/Js/ckfinder/core/connector/php/CKSource/CKFinder/Event/EditFileEvent.php
Outdated
Show resolved
Hide resolved
src/Backend/Core/Js/ckfinder/core/connector/php/CKSource/CKFinder/Event/FileUploadEvent.php
Outdated
Show resolved
Hide resolved
src/Backend/Core/Js/ckfinder/core/connector/php/CKSource/CKFinder/Event/MoveFileEvent.php
Outdated
Show resolved
Hide resolved
src/Backend/Core/Js/ckfinder/core/connector/php/CKSource/CKFinder/Event/RenameFileEvent.php
Outdated
Show resolved
Hide resolved
tijsverkoyen
approved these changes
Mar 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
https://next-app.activecollab.com/108877/my-work?modal=Task-241720-62
Summary by Sourcery
Remove legacy social media and cookie bar integrations and clean up deprecated APIs and settings now superseded by the privacy consent dialog and newer services.
Enhancements: