@@ -738,7 +738,7 @@ |
||
738 | 738 | ); |
739 | 739 | else |
740 | 740 | $context['allowed_actions'] = array( |
741 | - 'ok' => $txt['admin_browse_w_approve'] .' '. $txt['admin_browse_no_email'], |
|
741 | + 'ok' => $txt['admin_browse_w_approve'] . ' ' . $txt['admin_browse_no_email'], |
|
742 | 742 | 'okemail' => $txt['admin_browse_w_approve'] . ' ' . $txt['admin_browse_w_email'], |
743 | 743 | 'require_activation' => $txt['admin_browse_w_approve_require_activate'], |
744 | 744 | 'reject' => $txt['admin_browse_w_reject'], |
@@ -428,21 +428,28 @@ |
||
428 | 428 | * @param $index to use as index if specified |
429 | 429 | * @return array of values of specified $col from $array |
430 | 430 | */ |
431 | -if (!function_exists('array_column')) { |
|
432 | - function array_column($input, $column_key, $index_key = null) { |
|
433 | - $arr = array_map(function($d) use ($column_key, $index_key) { |
|
434 | - if (!isset($d[$column_key])) { |
|
431 | +if (!function_exists('array_column')) |
|
432 | +{ |
|
433 | + function array_column($input, $column_key, $index_key = null) |
|
434 | + { |
|
435 | + $arr = array_map(function($d) use ($column_key, $index_key) |
|
436 | + { |
|
437 | + if (!isset($d[$column_key])) |
|
438 | + { |
|
435 | 439 | return null; |
436 | 440 | } |
437 | - if ($index_key !== null) { |
|
441 | + if ($index_key !== null) |
|
442 | + { |
|
438 | 443 | return array($d[$index_key] => $d[$column_key]); |
439 | 444 | } |
440 | 445 | return $d[$column_key]; |
441 | 446 | }, $input); |
442 | 447 | |
443 | - if ($index_key !== null) { |
|
448 | + if ($index_key !== null) |
|
449 | + { |
|
444 | 450 | $tmp = array(); |
445 | - foreach ($arr as $ar) { |
|
451 | + foreach ($arr as $ar) |
|
452 | + { |
|
446 | 453 | $tmp[key($ar)] = current($ar); |
447 | 454 | } |
448 | 455 | $arr = $tmp; |
@@ -369,7 +369,7 @@ |
||
369 | 369 | // And a bit more for database changes. |
370 | 370 | if ($context['uninstalling'] && !empty($context['database_changes'])) |
371 | 371 | echo ' |
372 | - makeToggle(document.getElementById(\'db_changes_div\'), ', JavaScriptEscape($txt['package_db_uninstall_details']) , ');'; |
|
372 | + makeToggle(document.getElementById(\'db_changes_div\'), ', JavaScriptEscape($txt['package_db_uninstall_details']), ');'; |
|
373 | 373 | |
374 | 374 | echo ' |
375 | 375 | </script>'; |
@@ -498,7 +498,7 @@ |
||
498 | 498 | log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])])); |
499 | 499 | |
500 | 500 | $context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set) |
501 | - { |
|
501 | + { |
|
502 | 502 | return $v != $set; |
503 | 503 | }); |
504 | 504 | } |
@@ -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); |
@@ -741,7 +741,7 @@ |
||
741 | 741 | <div class="information noup">', $context['settings_message'], '</div>'; |
742 | 742 | |
743 | 743 | // Filter out any redundant separators before we start the loop |
744 | - $context['config_vars'] = array_filter($context['config_vars'], function ($v) use ($context) |
|
744 | + $context['config_vars'] = array_filter($context['config_vars'], function($v) use ($context) |
|
745 | 745 | { |
746 | 746 | static $config_vars, $prev; |
747 | 747 |
@@ -1965,7 +1965,7 @@ |
||
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) { return $carry * $item; }, true) == true) |
|
1969 | 1969 | unset($smiley_files[$key]); |
1970 | 1970 | } |
1971 | 1971 |
@@ -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; |
@@ -1823,7 +1823,7 @@ |
||
1823 | 1823 | if (!empty($excluded_groups)) |
1824 | 1824 | { |
1825 | 1825 | // Make sure this is an array of integers |
1826 | - $excluded_groups = array_filter((array) $excluded_groups, function ($v) |
|
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 | }); |
@@ -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 |