Rewrite to display correct message

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index adbd169537aa0b8ac910311360359708a7a2faf4..79a408a4d926548dc81bd693a5e33e4498e618d0 100644 (file)
--- 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 59e5c9d8dd13929ce8d0f16f37d8cbd1ac064aac..b42a0533a944520a562400974fee8f5ac3b40a48 100644 (file)
--- a/templates/de/html/member/member_mydata_locked.tpl
+++ b/templates/de/html/member/member_mydata_locked.tpl
@@ -3,7 +3,7 @@
                <td height="7" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td align="center">{--MEMBER_PROFILE_LOCKED_1--}$content[update_check]{--MEMBER_PROFILE_LOCKED_2--}</td>
+               <td align="center">$content[update_check]</td>
        </tr>
        <tr>
                <td height="7" class="seperator">&nbsp;</td>