Merge pull request #4118 from owncloud/remove-size-experiment

finally remove the file size obfuscation as it had more disadvantages.

2 files changed, 2 insertions, 20 deletions

diff --git a/lib/public/template.php b/lib/public/template.php
index ccf19cf052c..1c138671977 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -77,12 +77,12 @@ function relative_modified_date($timestamp) {
 
 
 /**
- * @brief Return a human readable outout for a file size.
+ * @brief DEPRECATED Return a human readable outout for a file size.
  * @param $byte size of a file in byte
  * @returns human readable interpretation of a file size
  */
 function simple_file_size($bytes) {
-	return(\simple_file_size($bytes));
+	return(\human_file_size($bytes));
 }
 
 
diff --git a/lib/template.php b/lib/template.php
index ae9ea187445..08df168afc6 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -84,24 +84,6 @@ function human_file_size( $bytes ) {
 	return OC_Helper::humanFileSize( $bytes );
 }
 
-function simple_file_size($bytes) {
-	if ($bytes < 0) {
-		return '?';
-	}
-	$mbytes = round($bytes / (1024 * 1024), 1);
-	if ($bytes == 0) {
-		return '0';
-	}
-	if ($mbytes < 0.1) {
-		return '&lt; 0.1';
-	}
-	if ($mbytes > 1000) {
-		return '&gt; 1000';
-	} else {
-		return number_format($mbytes, 1);
-	}
-}
-
 function relative_modified_date($timestamp) {
 	$l=OC_L10N::get('lib');
 	$timediff = time() - $timestamp;