diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-26 02:36:58 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-26 02:36:58 -0500 |
| commit | 8a750c3e875d590d351c3042570a134fcdf03e5d (patch) | |
| tree | 846df051bf732bd588cd1571d1727123493cef5b /lib/class/catalog.class.php | |
| parent | a12679b13d8d06c87308b1d26bc23c6b4fa5d92e (diff) | |
| download | ampache-8a750c3e875d590d351c3042570a134fcdf03e5d.tar.gz ampache-8a750c3e875d590d351c3042570a134fcdf03e5d.tar.bz2 ampache-8a750c3e875d590d351c3042570a134fcdf03e5d.zip | |
Move [un]format_bytes() from general.lib.php to UI
Diffstat (limited to 'lib/class/catalog.class.php')
| -rw-r--r-- | lib/class/catalog.class.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 9a75a5ea..3833d329 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -188,7 +188,7 @@ class Catalog extends database_object { $hours = floor($results['time'] / 3600); - $results['formatted_size'] = format_bytes($results['size']); + $results['formatted_size'] = UI::format_bytes($results['size']); $days = floor($hours / 24); $hours = $hours % 24; @@ -422,7 +422,7 @@ class Catalog extends database_object { public function add_files($path, $options) { // Profile the memory a bit - debug_event('Memory', format_bytes(memory_get_usage(true)), 5); + debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5); // See if we want a non-root path for the add if (isset($options['subdirectory'])) { @@ -457,7 +457,7 @@ class Catalog extends database_object { // Ensure that we've got our cache $this->_create_filecache(); - debug_event('Memory', format_bytes(memory_get_usage(true)), 5); + debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5); /* Recurse through this dir and create the files array */ while ( false !== ( $file = readdir($handle) ) ) { @@ -466,7 +466,7 @@ class Catalog extends database_object { if (substr($file,0,1) == '.') { continue; } debug_event('read',"Starting work on $file inside $path",'5','ampache-catalog'); - debug_event('Memory', format_bytes(memory_get_usage(true)), 5); + debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5); /* Create the new path */ $full_file = $path.$slash_type.$file; |