Ticket #17725: 17725.3.diff

wp-admin/includes/template.php

@@ -779 +779 @@
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Convert a human readable (hr) memory setting value as in 
+ * php.ini into the number of bytes (Shorthand Notation).
  *
  * @since 2.3.0
  *
- * @param unknown_type $size
- * @return unknown
+ * @param string $size memory setting value
+ * @return float bytes
  */
-function wp_convert_hr_to_bytes( $size ) {
-        $size = strtolower($size);
-        $bytes = (int) $size;
-        if ( strpos($size, 'k') !== false )
-                $bytes = intval($size) * 1024;
-        elseif ( strpos($size, 'm') !== false )
-                $bytes = intval($size) * 1024 * 1024;
-        elseif ( strpos($size, 'g') !== false )
-                $bytes = intval($size) * 1024 * 1024 * 1024;
+function wp_convert_hr_to_bytes( $size ) {      
+        $bytes = (float) $size;
+        if ($bytes) {   
+                $last = strtolower( substr( $size, -1 ) );
+                $pos = strpos( ' kmg', $last , 1);
+                if ( $pos ) $bytes *= pow( 1024, $pos);
+                $bytes = round( $bytes );
+        }
         return $bytes;
 }