From: Roland Häder Date: Tue, 3 Nov 2009 22:55:45 +0000 (+0000) Subject: Rewrite to display correct message X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=f353f4311bb8e2473781b7415b516f1aed8a6e8c Rewrite to display correct message --- diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index adbd169537..79a408a4d9 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -144,7 +144,8 @@ LIMIT 1", // How far is last change on his profile away from now? if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) { - $content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), 0); + $content['update_check'] = sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['update_check'] + getConfig('profile_lock'), 0)); + // You cannot change your account loadTemplate('member_mydata_locked', false, $content); } else { @@ -211,13 +212,13 @@ LIMIT 1", // Free result SQL_FREERESULT($result); - $content['last_change'] = $content['last_update'] + getConfig('profile_lock'); + $content['update_check'] = $content['last_update'] + getConfig('profile_lock'); // How far is last change on his profile away from now? - if (($content['last_change'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) { - $content['last_change'] = generateDateTime($content['last_change'] + getConfig('profile_lock'), 0); + if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) { + $content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), 0); // You cannot change your account - loadTemplate('member_mydata_locked'); + loadTemplate('member_mydata_locked', false, $content); } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) { // Invalid email address! loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED')); diff --git a/templates/de/html/member/member_mydata_locked.tpl b/templates/de/html/member/member_mydata_locked.tpl index 59e5c9d8dd..b42a0533a9 100644 --- a/templates/de/html/member/member_mydata_locked.tpl +++ b/templates/de/html/member/member_mydata_locked.tpl @@ -3,7 +3,7 @@   - {--MEMBER_PROFILE_LOCKED_1--}$content[update_check]{--MEMBER_PROFILE_LOCKED_2--} + $content[update_check]