Changeset 38012

Timestamp:

07/08/2016 11:26:58 AM (8 years ago)

Author:

ocean90

Message:

Boostrap: Move wp_convert_hr_to_bytes() to wp-includes/load.php.

wp_convert_hr_to_bytes() was previously defined in wp-includes/media.php because it's only used by wp_max_upload_size() in the same file.
Moving this function to load.php allows us to improve core's memory limit handling.

See #32075.

Location:

trunk/src/wp-includes

Files:

• load.php (modified) (1 diff)
• media.php (modified) (1 diff)

trunk/src/wp-includes/load.php

@@ -975 +975 @@
     return false;
 }
+
+/**
+ * Converts a shorthand byte value to an integer byte value.
+ *
+ * @since 2.3.0
+ * @since 4.6.0 Moved from media.php to load.php
+ *
+ * @param string $size A shorthand byte value.
+ * @return int An integer byte value.
+ */
+function wp_convert_hr_to_bytes( $size ) {
+    $size  = strtolower( $size );
+    $bytes = (int) $size;
+    if ( strpos( $size, 'k' ) !== false )
+        $bytes = intval( $size ) * KB_IN_BYTES;
+    elseif ( strpos( $size, 'm' ) !== false )
+        $bytes = intval($size) * MB_IN_BYTES;
+    elseif ( strpos( $size, 'g' ) !== false )
+        $bytes = intval( $size ) * GB_IN_BYTES;
+    return $bytes;
+}

trunk/src/wp-includes/media.php

@@ -2778 +2778 @@
 
 /**
- * Converts a shorthand byte value to an integer byte value.
- *
- * @since 2.3.0
- *
- * @param string $size A shorthand byte value.
- * @return int An integer byte value.
- */
-function wp_convert_hr_to_bytes( $size ) {
-    $size  = strtolower( $size );
-    $bytes = (int) $size;
-    if ( strpos( $size, 'k' ) !== false )
-        $bytes = intval( $size ) * KB_IN_BYTES;
-    elseif ( strpos( $size, 'm' ) !== false )
-        $bytes = intval($size) * MB_IN_BYTES;
-    elseif ( strpos( $size, 'g' ) !== false )
-        $bytes = intval( $size ) * GB_IN_BYTES;
-    return $bytes;
-}
-
-/**
  * Determines the maximum upload size allowed in php.ini.
  *