@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | // Set a list of common functions. |
| 105 | 105 | $ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);'; |
| 106 | 106 | $ent_check = empty($modSettings['disableEntityCheck']) ? function($string) |
| 107 | - { |
|
| 107 | + { |
|
| 108 | 108 | $string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string); |
| 109 | 109 | return $string; |
| 110 | 110 | } : function($string) |
@@ -918,7 +918,6 @@ discard block |
||
| 918 | 918 | $user_settings_min[$row['id_member']]['time_offset'] = ($tz_user->getOffset($time_user) - |
| 919 | 919 | $tz_system->getOffset($time_system)) / 3600; |
| 920 | 920 | } |
| 921 | - |
|
| 922 | 921 | else |
| 923 | 922 | $user_settings_min[$row['id_member']]['time_offset'] = empty($row['time_offset']) ? 0 : $row['time_offset']; |
| 924 | 923 | } |
@@ -2308,7 +2307,6 @@ discard block |
||
| 2308 | 2307 | loadLanguage('index+Modifications'); |
| 2309 | 2308 | $context['template_layers'] = array(); |
| 2310 | 2309 | } |
| 2311 | - |
|
| 2312 | 2310 | else |
| 2313 | 2311 | { |
| 2314 | 2312 | // Custom templates to load, or just default? |
@@ -2689,14 +2687,12 @@ discard block |
||
| 2689 | 2687 | $fileUrl = $settings['default_theme_url'] . '/css/' . $fileName; |
| 2690 | 2688 | $filePath = $settings['default_theme_dir'] . '/css/' . $fileName; |
| 2691 | 2689 | } |
| 2692 | - |
|
| 2693 | 2690 | else |
| 2694 | 2691 | { |
| 2695 | 2692 | $fileUrl = false; |
| 2696 | 2693 | $filePath = false; |
| 2697 | 2694 | } |
| 2698 | 2695 | } |
| 2699 | - |
|
| 2700 | 2696 | else |
| 2701 | 2697 | { |
| 2702 | 2698 | $fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName; |
@@ -2804,14 +2800,12 @@ discard block |
||
| 2804 | 2800 | $fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName; |
| 2805 | 2801 | $filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName; |
| 2806 | 2802 | } |
| 2807 | - |
|
| 2808 | 2803 | else |
| 2809 | 2804 | { |
| 2810 | 2805 | $fileUrl = false; |
| 2811 | 2806 | $filePath = false; |
| 2812 | 2807 | } |
| 2813 | 2808 | } |
| 2814 | - |
|
| 2815 | 2809 | else |
| 2816 | 2810 | { |
| 2817 | 2811 | $fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName; |