mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 02:36:38 +02:00
Code Issues Releases Wiki Activity

merge with revision #r8350

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-01-30 16:14:39 +00:00
parent 1407460895
commit 4b5fab372f
42 changed files with 199 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_pm.php
View File

@@ -92,7 +92,7 @@ class ucp_pm
{
if ($user->data['user_new_privmsg'])
{
$l_new_message = ($user->data['user_new_privmsg'] == 1 ) ? $user->lang['YOU_NEW_PM'] : $user->lang['YOU_NEW_PMS'];
$l_new_message = ($user->data['user_new_privmsg'] == 1) ? $user->lang['YOU_NEW_PM'] : $user->lang['YOU_NEW_PMS'];
}
else
{

2
phpBB/includes/ucp/ucp_prefs.php
View File

@@ -114,7 +114,7 @@ class ucp_prefs
$s_custom = false;
$dateformat_options .= '<option value="custom"';
if (!in_array($data['dateformat'], array_keys($user->lang['dateformats'])))
if (!isset($user->lang['dateformats'][$data['dateformat']]))
{
$dateformat_options .= ' selected="selected"';
$s_custom = true;