@@ -742,7 +742,7 @@ |
||
| 742 | 742 | |
| 743 | 743 | // Filter out any redundant separators before we start the loop |
| 744 | 744 | $context['config_vars'] = array_filter($context['config_vars'], function ($v) use ($context) |
| 745 | - { |
|
| 745 | + { |
|
| 746 | 746 | static $config_vars, $prev; |
| 747 | 747 | |
| 748 | 748 | $at_start = is_null($config_vars); |
@@ -1965,7 +1965,9 @@ |
||
| 1965 | 1965 | // Remove anything that isn't actually new from our list of files |
| 1966 | 1966 | foreach ($to_unset as $key => $ids) |
| 1967 | 1967 | { |
| 1968 | - if (array_reduce($ids, function ($carry, $item) { return $carry * $item; }, true) == true) |
|
| 1968 | + if (array_reduce($ids, function ($carry, $item) |
|
| 1969 | + { |
|
| 1970 | +return $carry * $item; }, true) == true) |
|
| 1969 | 1971 | unset($smiley_files[$key]); |
| 1970 | 1972 | } |
| 1971 | 1973 | |
@@ -1254,7 +1254,6 @@ |
||
| 1254 | 1254 | |
| 1255 | 1255 | return array($charset, $string, 'base64'); |
| 1256 | 1256 | } |
| 1257 | - |
|
| 1258 | 1257 | else |
| 1259 | 1258 | return array($charset, $string, '7bit'); |
| 1260 | 1259 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | // Set a list of common functions. |
| 83 | 83 | $ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);'; |
| 84 | 84 | $ent_check = empty($modSettings['disableEntityCheck']) ? function($string) |
| 85 | - { |
|
| 85 | + { |
|
| 86 | 86 | $string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string); |
| 87 | 87 | return $string; |
| 88 | 88 | } : function($string) |
@@ -2131,7 +2131,6 @@ discard block |
||
| 2131 | 2131 | loadLanguage('index+Modifications'); |
| 2132 | 2132 | $context['template_layers'] = array(); |
| 2133 | 2133 | } |
| 2134 | - |
|
| 2135 | 2134 | else |
| 2136 | 2135 | { |
| 2137 | 2136 | // Custom templates to load, or just default? |
@@ -2509,14 +2508,12 @@ discard block |
||
| 2509 | 2508 | $fileUrl = $settings['default_theme_url'] . '/css/' . $fileName; |
| 2510 | 2509 | $filePath = $settings['default_theme_dir'] . '/css/' . $fileName; |
| 2511 | 2510 | } |
| 2512 | - |
|
| 2513 | 2511 | else |
| 2514 | 2512 | { |
| 2515 | 2513 | $fileUrl = false; |
| 2516 | 2514 | $filePath = false; |
| 2517 | 2515 | } |
| 2518 | 2516 | } |
| 2519 | - |
|
| 2520 | 2517 | else |
| 2521 | 2518 | { |
| 2522 | 2519 | $fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName; |
@@ -2623,14 +2620,12 @@ discard block |
||
| 2623 | 2620 | $fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName; |
| 2624 | 2621 | $filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName; |
| 2625 | 2622 | } |
| 2626 | - |
|
| 2627 | 2623 | else |
| 2628 | 2624 | { |
| 2629 | 2625 | $fileUrl = false; |
| 2630 | 2626 | $filePath = false; |
| 2631 | 2627 | } |
| 2632 | 2628 | } |
| 2633 | - |
|
| 2634 | 2629 | else |
| 2635 | 2630 | { |
| 2636 | 2631 | $fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName; |
@@ -3205,7 +3205,9 @@ |
||
| 3205 | 3205 | return $string; |
| 3206 | 3206 | |
| 3207 | 3207 | // This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8) |
| 3208 | - $new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function ($matches) {return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';}, $string); |
|
| 3208 | + $new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function ($matches) |
|
| 3209 | + { |
|
| 3210 | +return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';}, $string); |
|
| 3209 | 3211 | |
| 3210 | 3212 | // @todo Add more possible fixes here. For example, fix incorrect array lengths, try to handle truncated strings gracefully, etc. |
| 3211 | 3213 | |
@@ -1824,7 +1824,7 @@ |
||
| 1824 | 1824 | { |
| 1825 | 1825 | // Make sure this is an array of integers |
| 1826 | 1826 | $excluded_groups = array_filter((array) $excluded_groups, function ($v) |
| 1827 | - { |
|
| 1827 | + { |
|
| 1828 | 1828 | return is_int($v) || is_string($v) && (string) intval($v) === $v; |
| 1829 | 1829 | }); |
| 1830 | 1830 | |
@@ -100,18 +100,22 @@ |
||
| 100 | 100 | $tempTab++; |
| 101 | 101 | $context['tabindex'] = $tempTab; |
| 102 | 102 | |
| 103 | - foreach ($context['richedit_buttons'] as $name => $button) { |
|
| 104 | - if ($name == 'spell_check') { |
|
| 103 | + foreach ($context['richedit_buttons'] as $name => $button) |
|
| 104 | + { |
|
| 105 | + if ($name == 'spell_check') |
|
| 106 | + { |
|
| 105 | 107 | $button['onclick'] = 'oEditorHandle_' . $editor_id . '.spellCheckStart();'; |
| 106 | 108 | } |
| 107 | 109 | |
| 108 | - if ($name == 'preview') { |
|
| 110 | + if ($name == 'preview') |
|
| 111 | + { |
|
| 109 | 112 | $button['value'] = isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $button['value']; |
| 110 | 113 | $button['onclick'] = $editor_context['preview_type'] == 2 ? '' : 'return submitThisOnce(this);'; |
| 111 | 114 | $button['show'] = $editor_context['preview_type']; |
| 112 | 115 | } |
| 113 | 116 | |
| 114 | - if ($button['show']) { |
|
| 117 | + if ($button['show']) |
|
| 118 | + { |
|
| 115 | 119 | echo ' |
| 116 | 120 | <input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', $button['type'] != 'hidden' ? ' tabindex="' . --$tempTab . '"' : '', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>'; |
| 117 | 121 | } |
@@ -1257,7 +1257,6 @@ discard block |
||
| 1257 | 1257 | |
| 1258 | 1258 | continue; |
| 1259 | 1259 | } |
| 1260 | - |
|
| 1261 | 1260 | else |
| 1262 | 1261 | { |
| 1263 | 1262 | $fh = @fopen($path . '/.htaccess', 'w'); |
@@ -1269,7 +1268,6 @@ discard block |
||
| 1269 | 1268 | Deny from all' . $close); |
| 1270 | 1269 | fclose($fh); |
| 1271 | 1270 | } |
| 1272 | - |
|
| 1273 | 1271 | else |
| 1274 | 1272 | $errors[] = 'htaccess_cannot_create_file'; |
| 1275 | 1273 | } |
@@ -1280,7 +1278,6 @@ discard block |
||
| 1280 | 1278 | |
| 1281 | 1279 | continue; |
| 1282 | 1280 | } |
| 1283 | - |
|
| 1284 | 1281 | else |
| 1285 | 1282 | { |
| 1286 | 1283 | $fh = @fopen($path . '/index.php', 'w'); |
@@ -1307,7 +1304,6 @@ discard block |
||
| 1307 | 1304 | ?' . '>'); |
| 1308 | 1305 | fclose($fh); |
| 1309 | 1306 | } |
| 1310 | - |
|
| 1311 | 1307 | else |
| 1312 | 1308 | $errors[] = 'index-php_cannot_create_file'; |
| 1313 | 1309 | } |
@@ -973,7 +973,7 @@ |
||
| 973 | 973 | { |
| 974 | 974 | $row = $smcFunc['db_fetch_assoc']($result); |
| 975 | 975 | if ($row['standard_conforming_strings'] !== 'on') |
| 976 | - { |
|
| 976 | + { |
|
| 977 | 977 | $incontext['continue'] = 0; |
| 978 | 978 | $incontext['error'] = $txt['error_pg_scs']; |
| 979 | 979 | } |