Release v2.11.1

2026-09-04 15:43:55 +01:00
parent 2c150b5b2e
commit 98f969ca0f
104 changed files with 3559 additions and 447 deletions
@@ -33,17 +33,22 @@ module.exports = function renderAccountPage(currentUser, message, returnUrl, all
      ? 'Use at least ' + requirements.minimumLength + ' characters and include uppercase, lowercase, number, and symbol.'
      : 'Use at least ' + requirements.minimumLength + ' characters and include ' + requirements.minimumCategories + ' of: uppercase, lowercase, number, and symbol.';

-  return renderView('account/password', {
+  return renderView('account/index', {
    title: 'My account',
    active: 'account',
    currentUser: currentUser || null,
    message: message || '',
    username: currentUser ? currentUser.username : '',
    name: currentUser ? String(currentUser.name || '') : '',
+    email: currentUser ? String(currentUser.email || '') : '',
+    emailPending: Boolean(currentUser && currentUser.pending_email),
+    pendingEmail: currentUser ? String(currentUser.pending_email || '') : '',
+    emailVerified: Boolean(currentUser && currentUser.email_verified_at),
    returnUrl: normalizeReturnUrl(returnUrl),
    allowUserSessionRevocation: Boolean(allowUserSessionRevocation),
    sessions: Array.isArray(sessions) ? sessions : [],
    passwordMinimumLength: requirements.minimumLength,
-    passwordRequirementsText: passwordRequirementsText
+    passwordRequirementsText: passwordRequirementsText,
+    scripts: ['js/account/account-page.js']
  });
 };