diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-05 12:15:27 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-05 12:15:27 -0500 |
| commit | 0f7cdfe9f416ed8cdc1f4373bac32e28c44b2549 (patch) | |
| tree | 6b202b6524abe2bc6f59294d52bf11efbc7988c2 /phpBB/includes | |
| parent | 819206a336f812cb1de3d0a5febd073f00c141ec (diff) | |
| parent | a8e74f5292aaa74e2035dd5f3ab972f0201a1fe7 (diff) | |
| download | forums-0f7cdfe9f416ed8cdc1f4373bac32e28c44b2549.tar forums-0f7cdfe9f416ed8cdc1f4373bac32e28c44b2549.tar.gz forums-0f7cdfe9f416ed8cdc1f4373bac32e28c44b2549.tar.bz2 forums-0f7cdfe9f416ed8cdc1f4373bac32e28c44b2549.tar.xz forums-0f7cdfe9f416ed8cdc1f4373bac32e28c44b2549.zip | |
Merge PR #1053 branch 'p/ticket/10841' into develop-olympus
* p/ticket/10841:
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 17d7d23f02..c6e43b831c 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -134,6 +134,35 @@ class ucp_prefs } $dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>'; + // check if there are any user-selectable languages + $sql = 'SELECT COUNT(lang_id) as languages_count + FROM ' . LANG_TABLE; + $result = $db->sql_query($sql); + if ($db->sql_fetchfield('languages_count') > 1) + { + $s_more_languages = true; + } + else + { + $s_more_languages = false; + } + $db->sql_freeresult($result); + + // check if there are any user-selectable styles + $sql = 'SELECT COUNT(style_id) as styles_count + FROM ' . STYLES_TABLE . ' + WHERE style_active = 1'; + $result = $db->sql_query($sql); + if ($db->sql_fetchfield('styles_count') > 1) + { + $s_more_styles = true; + } + else + { + $s_more_styles = false; + } + $db->sql_freeresult($result); + $template->assign_vars(array( 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', @@ -155,6 +184,9 @@ class ucp_prefs 'DEFAULT_DATEFORMAT' => $config['default_dateformat'], 'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']), + 'S_MORE_LANGUAGES' => $s_more_languages, + 'S_MORE_STYLES' => $s_more_styles, + 'S_LANG_OPTIONS' => language_select($data['lang']), 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']), 'S_TZ_OPTIONS' => tz_select($data['tz'], true), |