WordPress 4.7

[autoinstalls/wordpress.git] / wp-includes / random_compat / byte_safe_strings.php

diff --git a/wp-includes/random_compat/byte_safe_strings.php b/wp-includes/random_compat/byte_safe_strings.php
index a3cc90b146c808f761c95c909862cfd3c132b26f..ae3b7b9e6d59ab7b8bb5edba7932cc2f0fc57a26 100644 (file)
--- a/wp-includes/random_compat/byte_safe_strings.php
+++ b/wp-includes/random_compat/byte_safe_strings.php
@@ -50,8 +50,10 @@ if (!function_exists('RandomCompat_strlen')) {
                     'RandomCompat_strlen() expects a string'
                 );
             }
+
             return mb_strlen($binary_string, '8bit');
         }
+
     } else {
         /**
          * strlen() implementation that isn't brittle to mbstring.func_overload
@@ -77,8 +79,10 @@ if (!function_exists('RandomCompat_strlen')) {
 }
 
 if (!function_exists('RandomCompat_substr')) {
+
     if (
-        defined('MB_OVERLOAD_STRING') &&
+        defined('MB_OVERLOAD_STRING')
+        &&
         ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
     ) {
         /**
@@ -102,11 +106,13 @@ if (!function_exists('RandomCompat_substr')) {
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
+
             if (!is_int($start)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
             }
+
             if ($length === null) {
                 /**
                  * mb_substr($str, 0, NULL, '8bit') returns an empty string on
@@ -118,9 +124,12 @@ if (!function_exists('RandomCompat_substr')) {
                     'RandomCompat_substr(): Third argument should be an integer, or omitted'
                 );
             }
+
             return mb_substr($binary_string, $start, $length, '8bit');
         }
+
     } else {
+
         /**
          * substr() implementation that isn't brittle to mbstring.func_overload
          *
@@ -141,19 +150,23 @@ if (!function_exists('RandomCompat_substr')) {
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
+
             if (!is_int($start)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
             }
+
             if ($length !== null) {
                 if (!is_int($length)) {
                     throw new TypeError(
                         'RandomCompat_substr(): Third argument should be an integer, or omitted'
                     );
                 }
+
                 return substr($binary_string, $start, $length);
             }
+
             return substr($binary_string, $start);
         }
     }