|
@@ -2717,8 +2717,7 @@ discard block |
|
|
block discarded – undo |
|
2717
|
2717
|
$context['css_files_order'] = array(); |
|
2718
|
2718
|
|
|
2719
|
2719
|
$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
|
2720
|
|
- (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
2721
|
|
- (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
|
2720
|
+ (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2722
|
2721
|
$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
|
2723
|
2722
|
$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
|
2724
|
2723
|
$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true; |
|
@@ -2832,8 +2831,7 @@ discard block |
|
|
block discarded – undo |
|
2832
|
2831
|
global $settings, $context, $modSettings; |
|
2833
|
2832
|
|
|
2834
|
2833
|
$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
|
2835
|
|
- (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
2836
|
|
- (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
|
2834
|
+ (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2837
|
2835
|
$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
|
2838
|
2836
|
$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
|
2839
|
2837
|
$params['async'] = isset($params['async']) ? $params['async'] : false; |
|
@@ -3572,8 +3570,7 @@ discard block |
|
|
block discarded – undo |
|
3572
|
3570
|
|
|
3573
|
3571
|
// What accelerator we are going to try. |
|
3574
|
3572
|
$cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT; |
|
3575
|
|
- $fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : |
|
3576
|
|
- CacheApi::APIS_NAMESPACE . $cache_class_name; |
|
|
3573
|
+ $fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name; |
|
3577
|
3574
|
|
|
3578
|
3575
|
// Do some basic tests. |
|
3579
|
3576
|
if (class_exists($fully_qualified_class_name)) |
SimpleMachines /
SMF2.1
