|
@@ -814,7 +814,7 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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; |
|
@@ -2823,8 +2822,7 @@ discard block |
|
|
block discarded – undo |
|
2823
|
2822
|
global $settings, $context, $modSettings; |
|
2824
|
2823
|
|
|
2825
|
2824
|
$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
|
2826
|
|
- (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
2827
|
|
- (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
|
2825
|
+ (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2828
|
2826
|
$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
|
2829
|
2827
|
$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
|
2830
|
2828
|
$params['async'] = isset($params['async']) ? $params['async'] : false; |
|
@@ -3567,8 +3565,7 @@ discard block |
|
|
block discarded – undo |
|
3567
|
3565
|
|
|
3568
|
3566
|
// What accelerator we are going to try. |
|
3569
|
3567
|
$cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT; |
|
3570
|
|
- $fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : |
|
3571
|
|
- CacheApi::APIS_NAMESPACE . $cache_class_name; |
|
|
3568
|
+ $fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name; |
|
3572
|
3569
|
|
|
3573
|
3570
|
// Do some basic tests. |
|
3574
|
3571
|
if (class_exists($fully_qualified_class_name)) |
|
@@ -3872,7 +3869,7 @@ discard block |
|
|
block discarded – undo |
|
3872
|
3869
|
$auth_secret = hash_file('sha256', $boarddir . '/Settings.php'); |
|
3873
|
3870
|
|
|
3874
|
3871
|
// Set the last error to now, but only every 15 minutes. Don't need to flood the logs. |
|
3875
|
|
- if (empty($db_last_error) || ($db_last_error + 60*15) <= time()) |
|
|
3872
|
+ if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time()) |
|
3876
|
3873
|
{ |
|
3877
|
3874
|
updateDbLastError(time()); |
|
3878
|
3875
|
loadLanguage('Errors'); |
SimpleMachines /
SMF2.1
