@@ -814,7 +814,7 @@ discard block |
||
814 | 814 | 'filename' => empty($user_settings['filename']) ? '' : $user_settings['filename'], |
815 | 815 | 'custom_dir' => !empty($user_settings['attachment_type']) && $user_settings['attachment_type'] == 1, |
816 | 816 | 'id_attach' => isset($user_settings['id_attach']) ? $user_settings['id_attach'] : 0, |
817 | - 'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width']: 0, |
|
817 | + 'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width'] : 0, |
|
818 | 818 | 'height' => isset($user_settings['attachment_height']) > 0 ? $user_settings['attachment_height'] : 0, |
819 | 819 | ), |
820 | 820 | 'smiley_set' => isset($user_settings['smiley_set']) ? $user_settings['smiley_set'] : '', |
@@ -2708,8 +2708,7 @@ discard block |
||
2708 | 2708 | $context['css_files_order'] = array(); |
2709 | 2709 | |
2710 | 2710 | $params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
2711 | - (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
2712 | - (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2711 | + (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2713 | 2712 | $params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
2714 | 2713 | $themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
2715 | 2714 | $params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true; |
@@ -2833,8 +2832,7 @@ discard block |
||
2833 | 2832 | global $settings, $context, $modSettings, $boardurl; |
2834 | 2833 | |
2835 | 2834 | $params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
2836 | - (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
2837 | - (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2835 | + (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2838 | 2836 | $params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
2839 | 2837 | $themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
2840 | 2838 | $params['async'] = isset($params['async']) ? $params['async'] : false; |
@@ -2947,7 +2945,7 @@ discard block |
||
2947 | 2945 | $elements[] = JavaScriptEscape($element); |
2948 | 2946 | } |
2949 | 2947 | |
2950 | - $value = '[' . implode(', ',$elements) . ']'; |
|
2948 | + $value = '[' . implode(', ', $elements) . ']'; |
|
2951 | 2949 | } |
2952 | 2950 | } |
2953 | 2951 | |
@@ -3628,8 +3626,7 @@ discard block |
||
3628 | 3626 | |
3629 | 3627 | // What accelerator we are going to try. |
3630 | 3628 | $cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT; |
3631 | - $fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : |
|
3632 | - CacheApi::APIS_NAMESPACE . $cache_class_name; |
|
3629 | + $fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name; |
|
3633 | 3630 | |
3634 | 3631 | // Do some basic tests. |
3635 | 3632 | if (class_exists($fully_qualified_class_name)) |
@@ -3933,7 +3930,7 @@ discard block |
||
3933 | 3930 | $auth_secret = hash_file('sha256', $boarddir . '/Settings.php'); |
3934 | 3931 | |
3935 | 3932 | // Set the last error to now, but only every 15 minutes. Don't need to flood the logs. |
3936 | - if (empty($db_last_error) || ($db_last_error + 60*15) <= time()) |
|
3933 | + if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time()) |
|
3937 | 3934 | { |
3938 | 3935 | updateDbLastError(time()); |
3939 | 3936 | loadLanguage('Errors'); |