@@ -279,7 +279,6 @@ discard block |
||
| 279 | 279 | $condition = 'id_member IN ({array_int:members})'; |
| 280 | 280 | $parameters['members'] = $members; |
| 281 | 281 | } |
| 282 | - |
|
| 283 | 282 | elseif ($members === null) |
| 284 | 283 | $condition = '1=1'; |
| 285 | 284 | |
@@ -382,11 +381,9 @@ discard block |
||
| 382 | 381 | $val = $val . ' END'; |
| 383 | 382 | $type = 'raw'; |
| 384 | 383 | } |
| 385 | - |
|
| 386 | 384 | else |
| 387 | 385 | $val = alert_count($members, true); |
| 388 | 386 | } |
| 389 | - |
|
| 390 | 387 | elseif ($type == 'int' && ($val === '+' || $val === '-')) |
| 391 | 388 | { |
| 392 | 389 | $val = $var . ' ' . $val . ' 1'; |
@@ -2170,12 +2167,12 @@ discard block |
||
| 2170 | 2167 | 'tag' => 'cowsay', |
| 2171 | 2168 | 'parameters' => array( |
| 2172 | 2169 | 'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc) |
| 2173 | - { |
|
| 2170 | + { |
|
| 2174 | 2171 | return $smcFunc['substr']($eyes . 'oo', 0, 2); |
| 2175 | 2172 | }, |
| 2176 | 2173 | ), |
| 2177 | 2174 | 't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => ' ', 'validate' => function ($tongue) use ($smcFunc) |
| 2178 | - { |
|
| 2175 | + { |
|
| 2179 | 2176 | return $smcFunc['substr']($tongue . ' ', 0, 2); |
| 2180 | 2177 | }, |
| 2181 | 2178 | ), |
@@ -3273,7 +3270,7 @@ discard block |
||
| 3273 | 3270 | |
| 3274 | 3271 | // Replace away! |
| 3275 | 3272 | $message = preg_replace_callback($smileyPregSearch, function($matches) use ($smileyPregReplacements) |
| 3276 | - { |
|
| 3273 | + { |
|
| 3277 | 3274 | return $smileyPregReplacements[$matches[1]]; |
| 3278 | 3275 | }, $message); |
| 3279 | 3276 | } |
@@ -4071,7 +4068,6 @@ discard block |
||
| 4071 | 4068 | if (!isset($minSeed) && isset($js_file['options']['seed'])) |
| 4072 | 4069 | $minSeed = $js_file['options']['seed']; |
| 4073 | 4070 | } |
| 4074 | - |
|
| 4075 | 4071 | else |
| 4076 | 4072 | { |
| 4077 | 4073 | echo ' |
@@ -6354,7 +6350,6 @@ discard block |
||
| 6354 | 6350 | $isWritable = true; |
| 6355 | 6351 | break; |
| 6356 | 6352 | } |
| 6357 | - |
|
| 6358 | 6353 | else |
| 6359 | 6354 | @chmod($file, $val); |
| 6360 | 6355 | } |
@@ -7286,7 +7281,6 @@ discard block |
||
| 7286 | 7281 | |
| 7287 | 7282 | $length += array_length($value, $deep_count); |
| 7288 | 7283 | } |
| 7289 | - |
|
| 7290 | 7284 | else |
| 7291 | 7285 | $length += strlen($value); |
| 7292 | 7286 | } |
@@ -1396,7 +1396,9 @@ |
||
| 1396 | 1396 | |
| 1397 | 1397 | // Figure out the filename we'll tell the browser. |
| 1398 | 1398 | $datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile'); |
| 1399 | - $included_desc = array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes); |
|
| 1399 | + $included_desc = array_map(function ($datatype) use ($txt) |
|
| 1400 | + { |
|
| 1401 | +return $txt[$datatype]; }, $datatypes); |
|
| 1400 | 1402 | |
| 1401 | 1403 | $dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc); |
| 1402 | 1404 | $dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename))))); |
@@ -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 | } |
@@ -1658,7 +1657,6 @@ discard block |
||
| 1658 | 1657 | $time_user = new DateTime('now', $tz_user); |
| 1659 | 1658 | $profile['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600; |
| 1660 | 1659 | } |
| 1661 | - |
|
| 1662 | 1660 | else |
| 1663 | 1661 | { |
| 1664 | 1662 | // !!! Compatibility. |
@@ -2321,7 +2319,6 @@ discard block |
||
| 2321 | 2319 | loadLanguage('index+Modifications'); |
| 2322 | 2320 | $context['template_layers'] = array(); |
| 2323 | 2321 | } |
| 2324 | - |
|
| 2325 | 2322 | else |
| 2326 | 2323 | { |
| 2327 | 2324 | // Custom templates to load, or just default? |
@@ -2702,14 +2699,12 @@ discard block |
||
| 2702 | 2699 | $fileUrl = $settings['default_theme_url'] . '/css/' . $fileName; |
| 2703 | 2700 | $filePath = $settings['default_theme_dir'] . '/css/' . $fileName; |
| 2704 | 2701 | } |
| 2705 | - |
|
| 2706 | 2702 | else |
| 2707 | 2703 | { |
| 2708 | 2704 | $fileUrl = false; |
| 2709 | 2705 | $filePath = false; |
| 2710 | 2706 | } |
| 2711 | 2707 | } |
| 2712 | - |
|
| 2713 | 2708 | else |
| 2714 | 2709 | { |
| 2715 | 2710 | $fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName; |
@@ -2817,14 +2812,12 @@ discard block |
||
| 2817 | 2812 | $fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName; |
| 2818 | 2813 | $filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName; |
| 2819 | 2814 | } |
| 2820 | - |
|
| 2821 | 2815 | else |
| 2822 | 2816 | { |
| 2823 | 2817 | $fileUrl = false; |
| 2824 | 2818 | $filePath = false; |
| 2825 | 2819 | } |
| 2826 | 2820 | } |
| 2827 | - |
|
| 2828 | 2821 | else |
| 2829 | 2822 | { |
| 2830 | 2823 | $fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName; |
@@ -152,7 +152,9 @@ |
||
| 152 | 152 | |
| 153 | 153 | $feed_meta = array( |
| 154 | 154 | 'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']), |
| 155 | - 'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))), |
|
| 155 | + 'desc' => sentence_list(array_map(function ($datatype) use ($txt) |
|
| 156 | + { |
|
| 157 | +return $txt[$datatype]; }, array_keys($included))), |
|
| 156 | 158 | 'author' => $mbname, |
| 157 | 159 | 'source' => $scripturl . '?action=profile;u=' . $uid, |
| 158 | 160 | 'self' => '', // Unused, but can't be null. |
@@ -163,7 +163,8 @@ |
||
| 163 | 163 | else |
| 164 | 164 | $context['help_text'] = $_GET['help']; |
| 165 | 165 | |
| 166 | - switch ($_GET['help']) { |
|
| 166 | + switch ($_GET['help']) |
|
| 167 | + { |
|
| 167 | 168 | case 'cal_short_months': |
| 168 | 169 | $context['help_text'] = sprintf($context['help_text'], $txt['months_short'][1], $txt['months_titles'][1]); |
| 169 | 170 | break; |