@@ -5370,7 +5370,6 @@ discard block |
||
5370 | 5370 | |
5371 | 5371 | /** |
5372 | 5372 | * Tries different modes to make file/dirs writable. Wrapper function for chmod() |
5373 | - |
|
5374 | 5373 | * @param string $file The file/dir full path. |
5375 | 5374 | * @param int $value Not needed, added for legacy reasons. |
5376 | 5375 | * @return boolean true if the file/dir is already writable or the function was able to make it writable, false if the function couldn't make the file/dir writable. |
@@ -5410,7 +5409,6 @@ discard block |
||
5410 | 5409 | |
5411 | 5410 | /** |
5412 | 5411 | * Wrapper function for json_decode() with error handling. |
5413 | - |
|
5414 | 5412 | * @param string $json The string to decode. |
5415 | 5413 | * @param bool $returnAsArray To return the decoded string as an array or an object, SMF only uses Arrays but to keep on compatibility with json_decode its set to false as default. |
5416 | 5414 | * @param bool $logIt To specify if the error will be logged if theres any. |
@@ -426,8 +426,8 @@ |
||
426 | 426 | */ |
427 | 427 | function matchIPtoCIDR($ip_address, $cidr_address) |
428 | 428 | { |
429 | - list ($cidr_network, $cidr_subnetmask) = preg_split('/', $cidr_address); |
|
430 | - return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network); |
|
429 | + list ($cidr_network, $cidr_subnetmask) = preg_split('/', $cidr_address); |
|
430 | + return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network); |
|
431 | 431 | } |
432 | 432 | |
433 | 433 | /** |
@@ -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 |