From 26cfe83953081fbd6a080767a825c5bb1b53d2cf Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 25 Nov 2014 00:13:22 -0500 Subject: [PATCH] Closes #84: 'can_change_notification_settings' now respected by profile page --- admin/profile.php | 95 ++++++++++++++++++++++++++++---------------- language/en/text.php | 1 + 2 files changed, 61 insertions(+), 35 deletions(-) diff --git a/admin/profile.php b/admin/profile.php index e4df8727..fcb8c1d4 100644 --- a/admin/profile.php +++ b/admin/profile.php @@ -275,49 +275,74 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');

+ +
+
-
- - - - -
- - -
- - - -
-
-
- -
- +
+ + + + + +
+ + + +
+ + + + + +
+
+
+ + + + + +
+ -
diff --git a/language/en/text.php b/language/en/text.php index 1130610e..a2f57699 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -45,6 +45,7 @@ $hesklang['inactive_user'] = 'Your account is currently inactive. Contact an adm $hesklang['notify_customer_email'] = 'Emails to customer on reply'; $hesklang['notify_customer_email_text'] = 'Don\'t send email notifications of replies to the customer by default'; $hesklang['cant_edit_admin'] = 'You cannot edit the God Admin (User ID = 1)'; +$hesklang['notifications_disabled_info'] = 'Changing notifications settings has been disabled by your administrator.'; // ADDED OR MODIFIED IN NuMods 1.4.0 $hesklang['numods'] = 'NuMods';