@@ -273,7 +273,6 @@ |
||
| 273 | 273 | * Modify any setting related to topics. |
| 274 | 274 | * Requires the admin_forum permission. |
| 275 | 275 | * Accessed from ?action=admin;area=postsettings;sa=topics. |
| 276 | - |
|
| 277 | 276 | * @param bool $return_config Whether or not to return the config_vars array (used for admin search) |
| 278 | 277 | * @return void|array Returns nothing or returns $config_vars if $return_config is true |
| 279 | 278 | * @uses Admin template, edit_topic_settings sub-template. |
@@ -694,7 +694,6 @@ |
||
| 694 | 694 | * It shows as the maintain_forum admin area. |
| 695 | 695 | * It is accessed from ?action=admin;area=maintain;sa=database;activity=optimize. |
| 696 | 696 | * It also updates the optimize scheduled task such that the tables are not automatically optimized again too soon. |
| 697 | - |
|
| 698 | 697 | * @uses the optimize sub template |
| 699 | 698 | */ |
| 700 | 699 | function OptimizeTables() |
@@ -384,7 +384,7 @@ |
||
| 384 | 384 | clean_cache(); |
| 385 | 385 | |
| 386 | 386 | // If warning decrement is enabled and we have people who have not had a new warning in 24 hours, lower their warning level. |
| 387 | - list (, , $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']); |
|
| 387 | + list (,, $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']); |
|
| 388 | 388 | if ($modSettings['warning_decrement']) |
| 389 | 389 | { |
| 390 | 390 | // Find every member who has a warning level... |
@@ -3031,8 +3031,7 @@ |
||
| 3031 | 3031 | <div class="roundframe"> |
| 3032 | 3032 | <div> |
| 3033 | 3033 | ', !empty($context['tfa_backup']) ? ' |
| 3034 | - <div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : |
|
| 3035 | - ($modSettings['tfa_mode'] == 2 ? ' |
|
| 3034 | + <div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? ' |
|
| 3036 | 3035 | <div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), ' |
| 3037 | 3036 | <div class="smalltext">', $txt['tfa_desc'], '</div> |
| 3038 | 3037 | <div id="basicinfo" style="width: 60%"> |
@@ -104,7 +104,7 @@ |
||
| 104 | 104 | * |
| 105 | 105 | * @param string $class The fully-qualified class name. |
| 106 | 106 | */ |
| 107 | -spl_autoload_register(function ($class) use ($sourcedir) |
|
| 107 | +spl_autoload_register(function($class) use ($sourcedir) |
|
| 108 | 108 | { |
| 109 | 109 | $classMap = array( |
| 110 | 110 | 'ReCaptcha\\' => 'ReCaptcha/', |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | |
| 83 | 83 | // The helper is crucial. Include it first thing. |
| 84 | 84 | if (!file_exists($upgrade_path . '/upgrade-helper.php')) |
| 85 | - die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.'); |
|
| 85 | + die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.'); |
|
| 86 | 86 | |
| 87 | 87 | require_once($upgrade_path . '/upgrade-helper.php'); |
| 88 | 88 | |
@@ -1625,7 +1625,7 @@ discard block |
||
| 1625 | 1625 | |
| 1626 | 1626 | // Our custom error handler - does nothing but does stop public errors from XML! |
| 1627 | 1627 | set_error_handler( |
| 1628 | - function ($errno, $errstr, $errfile, $errline) use ($support_js) |
|
| 1628 | + function($errno, $errstr, $errfile, $errline) use ($support_js) |
|
| 1629 | 1629 | { |
| 1630 | 1630 | if ($support_js) |
| 1631 | 1631 | return true; |
@@ -2610,94 +2610,94 @@ discard block |
||
| 2610 | 2610 | // Translation table for the character sets not native for MySQL. |
| 2611 | 2611 | $translation_tables = array( |
| 2612 | 2612 | 'windows-1255' => array( |
| 2613 | - '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
| 2614 | - '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
| 2615 | - '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
| 2616 | - '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
| 2617 | - '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
| 2618 | - '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
| 2619 | - '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792', |
|
| 2620 | - '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF', |
|
| 2621 | - '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
| 2622 | - '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
| 2623 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 2624 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 2625 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 2626 | - '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
| 2627 | - '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
| 2628 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 2629 | - '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
| 2630 | - '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
| 2631 | - '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
| 2632 | - '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
| 2633 | - '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
| 2634 | - '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
| 2635 | - '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
| 2636 | - '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
| 2637 | - '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
| 2638 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 2639 | - '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
| 2640 | - '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 2641 | - '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
| 2642 | - '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
| 2643 | - '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
| 2644 | - '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
| 2645 | - '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
| 2646 | - '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
| 2647 | - '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
| 2648 | - '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
| 2649 | - '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
| 2650 | - '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
| 2651 | - '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
| 2652 | - '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
| 2653 | - '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
| 2654 | - '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
| 2613 | + '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
| 2614 | + '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
| 2615 | + '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
| 2616 | + '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
| 2617 | + '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
| 2618 | + '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
| 2619 | + '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792', |
|
| 2620 | + '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF', |
|
| 2621 | + '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
| 2622 | + '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
| 2623 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 2624 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 2625 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 2626 | + '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
| 2627 | + '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
| 2628 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 2629 | + '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
| 2630 | + '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
| 2631 | + '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
| 2632 | + '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
| 2633 | + '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
| 2634 | + '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
| 2635 | + '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
| 2636 | + '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
| 2637 | + '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
| 2638 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 2639 | + '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
| 2640 | + '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 2641 | + '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
| 2642 | + '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
| 2643 | + '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
| 2644 | + '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
| 2645 | + '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
| 2646 | + '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
| 2647 | + '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
| 2648 | + '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
| 2649 | + '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
| 2650 | + '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
| 2651 | + '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
| 2652 | + '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
| 2653 | + '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
| 2654 | + '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
| 2655 | 2655 | '0xFA' => '0xD7AA', |
| 2656 | 2656 | ), |
| 2657 | 2657 | 'windows-1253' => array( |
| 2658 | - '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
| 2659 | - '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
| 2660 | - '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
| 2661 | - '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
| 2662 | - '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
| 2663 | - '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E', |
|
| 2664 | - '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
| 2665 | - '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
| 2666 | - '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
| 2667 | - '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
| 2668 | - '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
| 2669 | - '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
| 2670 | - '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
| 2671 | - '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
| 2672 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 2673 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 2674 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 2675 | - '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
| 2676 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 2677 | - '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
| 2678 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 2679 | - '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
| 2680 | - '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
| 2681 | - '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
| 2682 | - '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 2683 | - '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
| 2684 | - '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
| 2685 | - '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
| 2686 | - '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
| 2687 | - '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
| 2688 | - '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
| 2689 | - '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
| 2690 | - '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
| 2691 | - '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
| 2692 | - '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
| 2693 | - '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
| 2694 | - '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
| 2695 | - '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
| 2696 | - '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
| 2697 | - '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
| 2698 | - '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
| 2699 | - '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
| 2700 | - '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', |
|
| 2658 | + '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
| 2659 | + '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
| 2660 | + '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
| 2661 | + '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
| 2662 | + '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
| 2663 | + '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E', |
|
| 2664 | + '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
| 2665 | + '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
| 2666 | + '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
| 2667 | + '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
| 2668 | + '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
| 2669 | + '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
| 2670 | + '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
| 2671 | + '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
| 2672 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 2673 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 2674 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 2675 | + '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
| 2676 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 2677 | + '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
| 2678 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 2679 | + '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
| 2680 | + '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
| 2681 | + '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
| 2682 | + '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 2683 | + '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
| 2684 | + '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
| 2685 | + '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
| 2686 | + '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
| 2687 | + '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
| 2688 | + '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
| 2689 | + '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
| 2690 | + '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
| 2691 | + '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
| 2692 | + '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
| 2693 | + '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
| 2694 | + '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
| 2695 | + '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
| 2696 | + '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
| 2697 | + '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
| 2698 | + '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
| 2699 | + '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
| 2700 | + '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', |
|
| 2701 | 2701 | ), |
| 2702 | 2702 | ); |
| 2703 | 2703 | |
@@ -3799,7 +3799,7 @@ discard block |
||
| 3799 | 3799 | <form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post"> |
| 3800 | 3800 | <input type="hidden" name="backup_done" id="backup_done" value="0"> |
| 3801 | 3801 | <strong>Completed <span id="tab_done">', $upcontext['cur_table_num'], '</span> out of ', $upcontext['table_count'], ' tables.</strong> |
| 3802 | - <div id="debug_section" style="height: ', ($is_debug ? '115' : '12') , 'px; overflow: auto;"> |
|
| 3802 | + <div id="debug_section" style="height: ', ($is_debug ? '115' : '12'), 'px; overflow: auto;"> |
|
| 3803 | 3803 | <span id="debuginfo"></span> |
| 3804 | 3804 | </div>'; |
| 3805 | 3805 | |
@@ -4300,7 +4300,7 @@ discard block |
||
| 4300 | 4300 | <form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post"> |
| 4301 | 4301 | <input type="hidden" name="utf8_done" id="utf8_done" value="0"> |
| 4302 | 4302 | <strong>Completed <span id="tab_done">', $upcontext['cur_table_num'], '</span> out of ', $upcontext['table_count'], ' tables.</strong> |
| 4303 | - <div id="debug_section" style="height: ', ($is_debug ? '97' : '12') , 'px; overflow: auto;"> |
|
| 4303 | + <div id="debug_section" style="height: ', ($is_debug ? '97' : '12'), 'px; overflow: auto;"> |
|
| 4304 | 4304 | <span id="debuginfo"></span> |
| 4305 | 4305 | </div>'; |
| 4306 | 4306 | |
@@ -4401,7 +4401,7 @@ discard block |
||
| 4401 | 4401 | <form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post"> |
| 4402 | 4402 | <input type="hidden" name="json_done" id="json_done" value="0"> |
| 4403 | 4403 | <strong>Completed <span id="tab_done">', $upcontext['cur_table_num'], '</span> out of ', $upcontext['table_count'], ' tables.</strong> |
| 4404 | - <div id="debug_section" style="height: ', ($is_debug ? '115' : '12') , 'px; overflow: auto;"> |
|
| 4404 | + <div id="debug_section" style="height: ', ($is_debug ? '115' : '12'), 'px; overflow: auto;"> |
|
| 4405 | 4405 | <span id="debuginfo"></span> |
| 4406 | 4406 | </div>'; |
| 4407 | 4407 | |
@@ -1542,7 +1542,7 @@ discard block |
||
| 1542 | 1542 | 'no_msg' => 0, |
| 1543 | 1543 | 'substep' => $_GET['substep'], |
| 1544 | 1544 | 'ignore_ids' => $ignore_ids, |
| 1545 | - 'attach_thumb' => array(0,3), |
|
| 1545 | + 'attach_thumb' => array(0, 3), |
|
| 1546 | 1546 | ) |
| 1547 | 1547 | ); |
| 1548 | 1548 | |
@@ -1572,7 +1572,7 @@ discard block |
||
| 1572 | 1572 | array( |
| 1573 | 1573 | 'to_remove' => $to_remove, |
| 1574 | 1574 | 'no_member' => 0, |
| 1575 | - 'attach_thumb' => array(0,3), |
|
| 1575 | + 'attach_thumb' => array(0, 3), |
|
| 1576 | 1576 | ) |
| 1577 | 1577 | ); |
| 1578 | 1578 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic) |
| 233 | 233 | WHERE t.id_topic IS NULL |
| 234 | 234 | GROUP BY m.id_topic, m.id_board', |
| 235 | - 'fix_processing' => function ($row) use ($smcFunc) |
|
| 235 | + 'fix_processing' => function($row) use ($smcFunc) |
|
| 236 | 236 | { |
| 237 | 237 | global $salvageBoardID; |
| 238 | 238 | |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | // Remove all topics that have zero messages in the messages table. |
| 319 | 319 | 'fix_collect' => array( |
| 320 | 320 | 'index' => 'id_topic', |
| 321 | - 'process' => function ($topics) use ($smcFunc) |
|
| 321 | + 'process' => function($topics) use ($smcFunc) |
|
| 322 | 322 | { |
| 323 | 323 | $smcFunc['db_query']('', ' |
| 324 | 324 | DELETE FROM {db_prefix}topics |
@@ -356,21 +356,21 @@ discard block |
||
| 356 | 356 | AND p.id_poll IS NULL |
| 357 | 357 | GROUP BY o.id_poll |
| 358 | 358 | ', |
| 359 | - 'fix_processing' => function ($row) use ($smcFunc, $txt) |
|
| 359 | + 'fix_processing' => function($row) use ($smcFunc, $txt) |
|
| 360 | 360 | { |
| 361 | 361 | global $salvageBoardID; |
| 362 | 362 | |
| 363 | 363 | $row['poster_name'] = !empty($row['poster_name']) ? $row['poster_name'] : $txt['guest']; |
| 364 | 364 | $row['id_poster'] = !empty($row['id_poster']) ? $row['id_poster'] : 0; |
| 365 | 365 | |
| 366 | - if(empty($row['id_board'])) |
|
| 366 | + if (empty($row['id_board'])) |
|
| 367 | 367 | { |
| 368 | 368 | // Only if we don't have a reasonable idea of where to put it. |
| 369 | 369 | createSalvageArea(); |
| 370 | - $row['id_board'] = (int)$salvageBoardID; |
|
| 370 | + $row['id_board'] = (int) $salvageBoardID; |
|
| 371 | 371 | } |
| 372 | 372 | |
| 373 | - if(empty($row['id_topic'])) { |
|
| 373 | + if (empty($row['id_topic'])) { |
|
| 374 | 374 | $newMessageID = $smcFunc['db_insert']('', |
| 375 | 375 | '{db_prefix}messages', |
| 376 | 376 | array( |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll) |
| 493 | 493 | WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 494 | 494 | AND t.id_poll IS NULL', |
| 495 | - 'fix_processing' => function ($row) use ($smcFunc, $txt) |
|
| 495 | + 'fix_processing' => function($row) use ($smcFunc, $txt) |
|
| 496 | 496 | { |
| 497 | 497 | global $salvageBoardID; |
| 498 | 498 | |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 606 | 606 | GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved |
| 607 | 607 | ORDER BY t.id_topic', |
| 608 | - 'fix_processing' => function ($row) use ($smcFunc) |
|
| 608 | + 'fix_processing' => function($row) use ($smcFunc) |
|
| 609 | 609 | { |
| 610 | 610 | $row['firstmsg_approved'] = (int) $row['firstmsg_approved']; |
| 611 | 611 | $row['myid_first_msg'] = (int) $row['myid_first_msg']; |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | ) |
| 635 | 635 | ); |
| 636 | 636 | }, |
| 637 | - 'message_function' => function ($row) use ($txt, &$context) |
|
| 637 | + 'message_function' => function($row) use ($txt, &$context) |
|
| 638 | 638 | { |
| 639 | 639 | // A pretend error? |
| 640 | 640 | if ($row['myid_first_msg'] == $row['myid_first_msg'] && $row['myid_first_msg'] == $row['myid_first_msg'] && $row['approved'] == $row['firstmsg_approved']) |
@@ -668,7 +668,7 @@ discard block |
||
| 668 | 668 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 669 | 669 | GROUP BY t.id_topic, t.num_replies, mf.approved |
| 670 | 670 | ORDER BY t.id_topic', |
| 671 | - 'fix_processing' => function ($row) |
|
| 671 | + 'fix_processing' => function($row) |
|
| 672 | 672 | { |
| 673 | 673 | |
| 674 | 674 | global $smcFunc; |
@@ -689,7 +689,7 @@ discard block |
||
| 689 | 689 | ); |
| 690 | 690 | |
| 691 | 691 | }, |
| 692 | - 'message_function' => function ($row) |
|
| 692 | + 'message_function' => function($row) |
|
| 693 | 693 | { |
| 694 | 694 | |
| 695 | 695 | global $txt, $context; |
@@ -722,7 +722,7 @@ discard block |
||
| 722 | 722 | GROUP BY t.id_topic, t.unapproved_posts |
| 723 | 723 | HAVING unapproved_posts != COUNT(mu.id_msg) |
| 724 | 724 | ORDER BY t.id_topic', |
| 725 | - 'fix_processing' => function ($row) |
|
| 725 | + 'fix_processing' => function($row) |
|
| 726 | 726 | { |
| 727 | 727 | |
| 728 | 728 | global $smcFunc; |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | WHERE b.id_board IS NULL |
| 765 | 765 | AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 766 | 766 | GROUP BY t.id_board', |
| 767 | - 'fix_processing' => function ($row) |
|
| 767 | + 'fix_processing' => function($row) |
|
| 768 | 768 | { |
| 769 | 769 | |
| 770 | 770 | global $smcFunc, $salvageCatID, $txt; |
@@ -813,7 +813,7 @@ discard block |
||
| 813 | 813 | ORDER BY b.id_cat, b.id_board', |
| 814 | 814 | 'fix_collect' => array( |
| 815 | 815 | 'index' => 'id_cat', |
| 816 | - 'process' => function ($cats) |
|
| 816 | + 'process' => function($cats) |
|
| 817 | 817 | { |
| 818 | 818 | global $smcFunc, $salvageCatID; |
| 819 | 819 | createSalvageArea(); |
@@ -849,7 +849,7 @@ discard block |
||
| 849 | 849 | // Last step-make sure all non-guest posters still exist. |
| 850 | 850 | 'fix_collect' => array( |
| 851 | 851 | 'index' => 'id_msg', |
| 852 | - 'process' => function ($msgs) |
|
| 852 | + 'process' => function($msgs) |
|
| 853 | 853 | { |
| 854 | 854 | |
| 855 | 855 | global $smcFunc; |
@@ -878,7 +878,7 @@ discard block |
||
| 878 | 878 | ORDER BY b.id_parent, b.id_board', |
| 879 | 879 | 'fix_collect' => array( |
| 880 | 880 | 'index' => 'id_parent', |
| 881 | - 'process' => function ($parents) |
|
| 881 | + 'process' => function($parents) |
|
| 882 | 882 | { |
| 883 | 883 | global $smcFunc, $salvageBoardID, $salvageCatID; |
| 884 | 884 | createSalvageArea(); |
@@ -912,7 +912,7 @@ discard block |
||
| 912 | 912 | AND p.id_poll IS NULL', |
| 913 | 913 | 'fix_collect' => array( |
| 914 | 914 | 'index' => 'id_poll', |
| 915 | - 'process' => function ($polls) |
|
| 915 | + 'process' => function($polls) |
|
| 916 | 916 | { |
| 917 | 917 | |
| 918 | 918 | global $smcFunc; |
@@ -946,7 +946,7 @@ discard block |
||
| 946 | 946 | ORDER BY cal.id_topic', |
| 947 | 947 | 'fix_collect' => array( |
| 948 | 948 | 'index' => 'id_topic', |
| 949 | - 'process' => function ($events) |
|
| 949 | + 'process' => function($events) |
|
| 950 | 950 | { |
| 951 | 951 | |
| 952 | 952 | global $smcFunc; |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}', |
| 979 | 979 | 'fix_collect' => array( |
| 980 | 980 | 'index' => 'id_topic', |
| 981 | - 'process' => function ($topics) |
|
| 981 | + 'process' => function($topics) |
|
| 982 | 982 | { |
| 983 | 983 | |
| 984 | 984 | global $smcFunc; |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | GROUP BY lt.id_member', |
| 1011 | 1011 | 'fix_collect' => array( |
| 1012 | 1012 | 'index' => 'id_member', |
| 1013 | - 'process' => function ($members) |
|
| 1013 | + 'process' => function($members) |
|
| 1014 | 1014 | { |
| 1015 | 1015 | |
| 1016 | 1016 | global $smcFunc; |
@@ -1042,7 +1042,7 @@ discard block |
||
| 1042 | 1042 | GROUP BY lb.id_board', |
| 1043 | 1043 | 'fix_collect' => array( |
| 1044 | 1044 | 'index' => 'id_board', |
| 1045 | - 'process' => function ($boards) |
|
| 1045 | + 'process' => function($boards) |
|
| 1046 | 1046 | { |
| 1047 | 1047 | |
| 1048 | 1048 | global $smcFunc; |
@@ -1074,7 +1074,7 @@ discard block |
||
| 1074 | 1074 | GROUP BY lb.id_member', |
| 1075 | 1075 | 'fix_collect' => array( |
| 1076 | 1076 | 'index' => 'id_member', |
| 1077 | - 'process' => function ($members) use ($smcFunc) |
|
| 1077 | + 'process' => function($members) use ($smcFunc) |
|
| 1078 | 1078 | { |
| 1079 | 1079 | $smcFunc['db_query']('', ' |
| 1080 | 1080 | DELETE FROM {db_prefix}log_boards |
@@ -1103,7 +1103,7 @@ discard block |
||
| 1103 | 1103 | GROUP BY lmr.id_board', |
| 1104 | 1104 | 'fix_collect' => array( |
| 1105 | 1105 | 'index' => 'id_board', |
| 1106 | - 'process' => function ($boards) use ($smcFunc) |
|
| 1106 | + 'process' => function($boards) use ($smcFunc) |
|
| 1107 | 1107 | { |
| 1108 | 1108 | $smcFunc['db_query']('', ' |
| 1109 | 1109 | DELETE FROM {db_prefix}log_mark_read |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | GROUP BY lmr.id_member', |
| 1133 | 1133 | 'fix_collect' => array( |
| 1134 | 1134 | 'index' => 'id_member', |
| 1135 | - 'process' => function ($members) use ($smcFunc) |
|
| 1135 | + 'process' => function($members) use ($smcFunc) |
|
| 1136 | 1136 | { |
| 1137 | 1137 | $smcFunc['db_query']('', ' |
| 1138 | 1138 | DELETE FROM {db_prefix}log_mark_read |
@@ -1161,7 +1161,7 @@ discard block |
||
| 1161 | 1161 | GROUP BY pmr.id_pm', |
| 1162 | 1162 | 'fix_collect' => array( |
| 1163 | 1163 | 'index' => 'id_pm', |
| 1164 | - 'process' => function ($pms) use ($smcFunc) |
|
| 1164 | + 'process' => function($pms) use ($smcFunc) |
|
| 1165 | 1165 | { |
| 1166 | 1166 | $smcFunc['db_query']('', ' |
| 1167 | 1167 | DELETE FROM {db_prefix}pm_recipients |
@@ -1191,7 +1191,7 @@ discard block |
||
| 1191 | 1191 | GROUP BY pmr.id_member', |
| 1192 | 1192 | 'fix_collect' => array( |
| 1193 | 1193 | 'index' => 'id_member', |
| 1194 | - 'process' => function ($members) |
|
| 1194 | + 'process' => function($members) |
|
| 1195 | 1195 | { |
| 1196 | 1196 | |
| 1197 | 1197 | global $smcFunc; |
@@ -1223,7 +1223,7 @@ discard block |
||
| 1223 | 1223 | AND mem.id_member IS NULL', |
| 1224 | 1224 | 'fix_collect' => array( |
| 1225 | 1225 | 'index' => 'id_pm', |
| 1226 | - 'process' => function ($guestMessages) |
|
| 1226 | + 'process' => function($guestMessages) |
|
| 1227 | 1227 | { |
| 1228 | 1228 | |
| 1229 | 1229 | global $smcFunc; |
@@ -1255,7 +1255,7 @@ discard block |
||
| 1255 | 1255 | GROUP BY ln.id_member', |
| 1256 | 1256 | 'fix_collect' => array( |
| 1257 | 1257 | 'index' => 'id_member', |
| 1258 | - 'process' => function ($members) use ($smcFunc) |
|
| 1258 | + 'process' => function($members) use ($smcFunc) |
|
| 1259 | 1259 | { |
| 1260 | 1260 | $smcFunc['db_query']('', ' |
| 1261 | 1261 | DELETE FROM {db_prefix}log_notify |
@@ -1282,7 +1282,7 @@ discard block |
||
| 1282 | 1282 | LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic) |
| 1283 | 1283 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
| 1284 | 1284 | AND lss.id_topic IS NULL', |
| 1285 | - 'fix_full_processing' => function ($result) |
|
| 1285 | + 'fix_full_processing' => function($result) |
|
| 1286 | 1286 | { |
| 1287 | 1287 | |
| 1288 | 1288 | global $smcFunc; |
@@ -1314,7 +1314,7 @@ discard block |
||
| 1314 | 1314 | ); |
| 1315 | 1315 | |
| 1316 | 1316 | }, |
| 1317 | - 'message_function' => function ($row) |
|
| 1317 | + 'message_function' => function($row) |
|
| 1318 | 1318 | { |
| 1319 | 1319 | |
| 1320 | 1320 | global $txt, $context; |
@@ -1344,7 +1344,7 @@ discard block |
||
| 1344 | 1344 | AND t.id_topic IS NULL', |
| 1345 | 1345 | 'fix_collect' => array( |
| 1346 | 1346 | 'index' => 'id_topic', |
| 1347 | - 'process' => function ($deleteTopics) |
|
| 1347 | + 'process' => function($deleteTopics) |
|
| 1348 | 1348 | { |
| 1349 | 1349 | |
| 1350 | 1350 | global $smcFunc; |
@@ -1376,7 +1376,7 @@ discard block |
||
| 1376 | 1376 | AND mem.id_member IS NULL', |
| 1377 | 1377 | 'fix_collect' => array( |
| 1378 | 1378 | 'index' => 'id_member', |
| 1379 | - 'process' => function ($members) |
|
| 1379 | + 'process' => function($members) |
|
| 1380 | 1380 | { |
| 1381 | 1381 | |
| 1382 | 1382 | global $smcFunc; |
@@ -1407,7 +1407,7 @@ discard block |
||
| 1407 | 1407 | AND p.id_poll IS NULL', |
| 1408 | 1408 | 'fix_collect' => array( |
| 1409 | 1409 | 'index' => 'id_poll', |
| 1410 | - 'process' => function ($polls) |
|
| 1410 | + 'process' => function($polls) |
|
| 1411 | 1411 | { |
| 1412 | 1412 | |
| 1413 | 1413 | global $smcFunc; |
@@ -1438,7 +1438,7 @@ discard block |
||
| 1438 | 1438 | AND lrc.id_report IS NULL', |
| 1439 | 1439 | 'fix_collect' => array( |
| 1440 | 1440 | 'index' => 'id_report', |
| 1441 | - 'process' => function ($reports) |
|
| 1441 | + 'process' => function($reports) |
|
| 1442 | 1442 | { |
| 1443 | 1443 | |
| 1444 | 1444 | global $smcFunc; |
@@ -1469,7 +1469,7 @@ discard block |
||
| 1469 | 1469 | AND lr.id_report IS NULL', |
| 1470 | 1470 | 'fix_collect' => array( |
| 1471 | 1471 | 'index' => 'id_report', |
| 1472 | - 'process' => function ($reports) |
|
| 1472 | + 'process' => function($reports) |
|
| 1473 | 1473 | { |
| 1474 | 1474 | global $smcFunc; |
| 1475 | 1475 | $smcFunc['db_query']('', ' |
@@ -1499,7 +1499,7 @@ discard block |
||
| 1499 | 1499 | GROUP BY lgr.id_member', |
| 1500 | 1500 | 'fix_collect' => array( |
| 1501 | 1501 | 'index' => 'id_member', |
| 1502 | - 'process' => function ($members) |
|
| 1502 | + 'process' => function($members) |
|
| 1503 | 1503 | { |
| 1504 | 1504 | global $smcFunc; |
| 1505 | 1505 | $smcFunc['db_query']('', ' |
@@ -1529,7 +1529,7 @@ discard block |
||
| 1529 | 1529 | GROUP BY lgr.id_group', |
| 1530 | 1530 | 'fix_collect' => array( |
| 1531 | 1531 | 'index' => 'id_group', |
| 1532 | - 'process' => function ($groups) |
|
| 1532 | + 'process' => function($groups) |
|
| 1533 | 1533 | { |
| 1534 | 1534 | global $smcFunc; |
| 1535 | 1535 | $smcFunc['db_query']('', ' |
@@ -437,9 +437,9 @@ discard block |
||
| 437 | 437 | { |
| 438 | 438 | // Sort events by start time (all day events will be listed first) |
| 439 | 439 | uasort($day['events'], function($a, $b) { |
| 440 | - if ($a['start_timestamp'] == $b['start_timestamp']) |
|
| 441 | - return 0; |
|
| 442 | - return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
|
| 440 | + if ($a['start_timestamp'] == $b['start_timestamp']) |
|
| 441 | + return 0; |
|
| 442 | + return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
|
| 443 | 443 | }); |
| 444 | 444 | |
| 445 | 445 | echo ' |
@@ -619,9 +619,9 @@ discard block |
||
| 619 | 619 | { |
| 620 | 620 | // Sort events by start time (all day events will be listed first) |
| 621 | 621 | uasort($day['events'], function($a, $b) { |
| 622 | - if ($a['start_timestamp'] == $b['start_timestamp']) |
|
| 623 | - return 0; |
|
| 624 | - return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
|
| 622 | + if ($a['start_timestamp'] == $b['start_timestamp']) |
|
| 623 | + return 0; |
|
| 624 | + return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
|
| 625 | 625 | }); |
| 626 | 626 | |
| 627 | 627 | foreach ($day['events'] as $event) |