diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-10-30 12:43:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-10-30 12:43:08 +0200 |
| commit | 36820a4f4f099b20d83044416ec208c7a4cbf63c (patch) | |
| tree | 23b0c2b44957a0d393c56fe3fa67ee84812bb99d /phpBB/includes/acp | |
| parent | 8943cab3c045b61f7a51b94a505cb70a0e8889c0 (diff) | |
| parent | 67b243cfc53e3f5f8bf6cd2a5eb80df475a6dd4c (diff) | |
| download | forums-36820a4f4f099b20d83044416ec208c7a4cbf63c.tar forums-36820a4f4f099b20d83044416ec208c7a4cbf63c.tar.gz forums-36820a4f4f099b20d83044416ec208c7a4cbf63c.tar.bz2 forums-36820a4f4f099b20d83044416ec208c7a4cbf63c.tar.xz forums-36820a4f4f099b20d83044416ec208c7a4cbf63c.zip | |
Merge branch 'ticket/rxu/9867' into develop
* ticket/rxu/9867:
[ticket/9867] Adjust the implementation of error messages localization.
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 6be0760be0..e9550648ad 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -921,7 +921,7 @@ class acp_users } // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); + $error = array_map(array($user, 'lang'), $error); } if ($user_id == $user->data['user_id']) @@ -1405,7 +1405,7 @@ class acp_users } // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); + $error = array_map(array($user, 'lang'), $error); } $s_birthday_day_options = '<option value="0"' . ((!$data['bday_day']) ? ' selected="selected"' : '') . '>--</option>'; @@ -1588,7 +1588,7 @@ class acp_users } // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); + $error = array_map(array($user, 'lang'), $error); } $dateformat_options = ''; @@ -1714,7 +1714,7 @@ class acp_users } // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); + $error = array_map(array($user, 'lang'), $error); } if (!$config['allow_avatar'] && $user_row['user_avatar_type']) @@ -1857,7 +1857,7 @@ class acp_users } // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); + $error = array_map(array($user, 'lang'), $error); } $signature_preview = ''; |