From df78fb4ef35a66575f574c13effb7b13c3ca0376 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <ocean90@git.wordpress.org>
Date: Fri, 8 Jul 2016 11:26:58 +0000
Subject: [PATCH] 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@38012 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/load.php  | 21 +++++++++++++++++++++
 src/wp-includes/media.php | 20 --------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php
index c6ff6cb4c1..6699495fc4 100644
--- a/src/wp-includes/load.php
+++ b/src/wp-includes/load.php
@@ -974,3 +974,24 @@ function is_ssl() {
 	}
 	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;
+}
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index 6a060b1c30..df96a17cf8 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -2776,26 +2776,6 @@ function wp_expand_dimensions( $example_width, $example_height, $max_width, $max
 	return wp_constrain_dimensions( $example_width * 1000000, $example_height * 1000000, $max_width, $max_height );
 }
 
-/**
- * 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.
  *