aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_prefs.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-01-30 16:14:39 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-01-30 16:14:39 +0000
commit4b5fab372ff69a809144dee3a0a7f90c219fe400 (patch)
tree3835425dae514f7296b6aaf77eed81c7f2617a5f /phpBB/includes/ucp/ucp_prefs.php
parent140746089594307c9bc2ad084ea2355dcbddbe16 (diff)
downloadforums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar
forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.gz
forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.bz2
forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.xz
forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.zip
merge with revision #r8350
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_prefs.php')
-rw-r--r--phpBB/includes/ucp/ucp_prefs.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 3ce3ea73ed..3762cf25f6 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -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;