diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-30 00:34:36 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-30 00:34:36 +0200 |
| commit | 7425efade78a04f20cb3cc83f964c6a00094b6ce (patch) | |
| tree | 967aa50e8873c88f0adf6f91d0285ab1c54b7189 /lib/public/template.php | |
| parent | b4a523927823ab8bc80c5f1fc0d5bd5ef61f8eb8 (diff) | |
| parent | 7c6246fa451c4646dfaa1396dd37e0b3eb9706ba (diff) | |
| download | nextcloud-server-7425efade78a04f20cb3cc83f964c6a00094b6ce.tar.gz nextcloud-server-7425efade78a04f20cb3cc83f964c6a00094b6ce.zip | |
Merge branch 'master' into oc_preview
Conflicts:
3rdparty
lib/template.php
Diffstat (limited to 'lib/public/template.php')
| -rw-r--r-- | lib/public/template.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/public/template.php b/lib/public/template.php index 69997ad42b6..3b1a4ed4906 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -96,12 +96,13 @@ 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. + * @deprecated human_file_size() instead * @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)); } |