Merge branch '4.x' into 5.x

# Conflicts:
#	CHANGELOG.md

Author: angrybrad

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## Unreleased
 
 - Fixed XSS vulnerabilities.
+- Fixed a bug where the order’s table was showing the incorrect column heading on the Edit User page.
+- Fixed a high-severity SQL injection vulnerability in the control panel. (GHSA-j3x5-mghf-xvfw)
 
 ## 5.5.2 - 2025-12-31