Merge pull request #39 from dimayakovlev/dimayakovlev/issue34

Fix notice in function toBytes()

admin/inc/basic.php

@@ -1084,20 +1084,23 @@ function get_site_version($echo = true) {
 
 /**
  * Convert to Bytes
+ * Convert M/G/K byte string to bytes
  *
  * @since 3.0
+ * @since 3.5.0 Fix notice
  *
- * @param $str string
- * @return string
+ * @param mixed $str
+ * @return mixed
  */
 function toBytes($str) {
-	$val = trim($str);
-	$last = strtolower($str[strlen($str)-1]);
-		switch($last) {
-			case 'g': $val *= 1024;
-			case 'm': $val *= 1024;
-			case 'k': $val *= 1024;
-		}
+	if (is_numeric($str)) return (int)$str;
+	$val = (int)trim($str, 'gmkGMK');
+	$last = strtolower($str[strlen($str) - 1]);
+	switch ($last) {
+		case 'g': $val *= 1024;
+		case 'm': $val *= 1024;
+		case 'k': $val *= 1024;
+	}
 	return $val;
 }