@@ -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) |
@@ -929,7 +929,6 @@ discard block |
||
929 | 929 | $user_info_min[$row['id_member']]['time_offset'] = ($tz_user->getOffset($time_user) - |
930 | 930 | $tz_system->getOffset($time_system)) / 3600; |
931 | 931 | } |
932 | - |
|
933 | 932 | else |
934 | 933 | $user_info_min[$row['id_member']]['time_offset'] = empty($row['time_offset']) ? 0 : $row['time_offset']; |
935 | 934 | } |
@@ -1657,7 +1656,6 @@ discard block |
||
1657 | 1656 | $time_user = new DateTime('now', $tz_user); |
1658 | 1657 | $profile['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600; |
1659 | 1658 | } |
1660 | - |
|
1661 | 1659 | else |
1662 | 1660 | { |
1663 | 1661 | // !!! Compatibility. |
@@ -2351,7 +2349,6 @@ discard block |
||
2351 | 2349 | loadLanguage('index+Modifications'); |
2352 | 2350 | $context['template_layers'] = array(); |
2353 | 2351 | } |
2354 | - |
|
2355 | 2352 | else |
2356 | 2353 | { |
2357 | 2354 | // Custom templates to load, or just default? |
@@ -2705,8 +2705,7 @@ discard block |
||
2705 | 2705 | $context['css_files_order'] = array(); |
2706 | 2706 | |
2707 | 2707 | $params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
2708 | - (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
2709 | - (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2708 | + (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2710 | 2709 | $params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
2711 | 2710 | $themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
2712 | 2711 | $params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true; |
@@ -2820,8 +2819,7 @@ discard block |
||
2820 | 2819 | global $settings, $context, $modSettings; |
2821 | 2820 | |
2822 | 2821 | $params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
2823 | - (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
2824 | - (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2822 | + (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
2825 | 2823 | $params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
2826 | 2824 | $themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
2827 | 2825 | $params['async'] = isset($params['async']) ? $params['async'] : false; |
@@ -455,7 +455,7 @@ |
||
455 | 455 | |
456 | 456 | elseif ($context['uninstalling']) |
457 | 457 | echo ' |
458 | - ', $txt['package_uninstall_done'] .' <br> |
|
458 | + ', $txt['package_uninstall_done'] . ' <br> |
|
459 | 459 | ', '<a href="', $context['remove_url'], '" class="button">', $txt['package_keep'], '</a>', '<a href="', $context['remove_url'], '" class="button">', $txt['package_delete2'], '</a>'; |
460 | 460 | |
461 | 461 | elseif ($context['install_finished']) |
@@ -1860,25 +1860,25 @@ |
||
1860 | 1860 | $fields = array(); |
1861 | 1861 | $new_sort = array(); |
1862 | 1862 | |
1863 | - while($row = $smcFunc['db_fetch_assoc']($request)) |
|
1863 | + while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1864 | 1864 | $fields[] = $row['id_field']; |
1865 | 1865 | $smcFunc['db_free_result']($request); |
1866 | 1866 | |
1867 | 1867 | $idx = array_search($context['fid'], $fields); |
1868 | 1868 | |
1869 | - if ($_GET['move'] == 'down' && count($fields) - 1 > $idx ) |
|
1869 | + if ($_GET['move'] == 'down' && count($fields) - 1 > $idx) |
|
1870 | 1870 | { |
1871 | - $new_sort = array_slice($fields ,0 ,$idx ,true); |
|
1871 | + $new_sort = array_slice($fields, 0, $idx, true); |
|
1872 | 1872 | $new_sort[] = $fields[$idx + 1]; |
1873 | 1873 | $new_sort[] = $fields[$idx]; |
1874 | - $new_sort += array_slice($fields ,$idx + 2 ,count($fields) ,true); |
|
1874 | + $new_sort += array_slice($fields, $idx + 2, count($fields), true); |
|
1875 | 1875 | } |
1876 | 1876 | elseif ($context['fid'] > 0 and $idx < count($fields)) |
1877 | 1877 | { |
1878 | - $new_sort = array_slice($fields ,0 ,($idx - 1) ,true); |
|
1878 | + $new_sort = array_slice($fields, 0, ($idx - 1), true); |
|
1879 | 1879 | $new_sort[] = $fields[$idx]; |
1880 | 1880 | $new_sort[] = $fields[$idx - 1]; |
1881 | - $new_sort += array_slice($fields ,($idx + 1) ,count($fields) ,true); |
|
1881 | + $new_sort += array_slice($fields, ($idx + 1), count($fields), true); |
|
1882 | 1882 | } |
1883 | 1883 | else |
1884 | 1884 | redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler |
@@ -320,7 +320,7 @@ |
||
320 | 320 | { |
321 | 321 | // PHPBB 3 check this function exists in PHP 5.5 or higher |
322 | 322 | if (function_exists('password_verify')) |
323 | - $other_passwords[] = password_verify($_POST['passwrd'],$user_settings['password_salt']); |
|
323 | + $other_passwords[] = password_verify($_POST['passwrd'], $user_settings['password_salt']); |
|
324 | 324 | |
325 | 325 | // PHP-Fusion |
326 | 326 | $other_passwords[] = hash_hmac('sha256', $_POST['passwrd'], $user_settings['password_salt']); |