diff --git a/administrator/components/com_cache/views/cache/tmpl/default.php b/administrator/components/com_cache/views/cache/tmpl/default.php index 1886d59a66721..06a4a60cbe608 100644 --- a/administrator/components/com_cache/views/cache/tmpl/default.php +++ b/administrator/components/com_cache/views/cache/tmpl/default.php @@ -67,7 +67,7 @@ count; ?> - size*1024); ?> + size); ?> diff --git a/libraries/joomla/cache/storage/apc.php b/libraries/joomla/cache/storage/apc.php index 2e153242488e8..2d41be8f14d42 100644 --- a/libraries/joomla/cache/storage/apc.php +++ b/libraries/joomla/cache/storage/apc.php @@ -96,7 +96,7 @@ public function getAll() $item = $data[$group]; } - $item->updateSize($key['mem_size'] / 1024); + $item->updateSize($key['mem_size']); $data[$group] = $item; } diff --git a/libraries/joomla/cache/storage/apcu.php b/libraries/joomla/cache/storage/apcu.php index 16c611cefdf9c..548652d27bf9c 100644 --- a/libraries/joomla/cache/storage/apcu.php +++ b/libraries/joomla/cache/storage/apcu.php @@ -96,7 +96,7 @@ public function getAll() $item = $data[$group]; } - $item->updateSize($key['mem_size'] / 1024); + $item->updateSize($key['mem_size']); $data[$group] = $item; } diff --git a/libraries/joomla/cache/storage/cachelite.php b/libraries/joomla/cache/storage/cachelite.php index e60b1df5c3aa9..21c3ce416e5b0 100644 --- a/libraries/joomla/cache/storage/cachelite.php +++ b/libraries/joomla/cache/storage/cachelite.php @@ -153,7 +153,7 @@ public function getAll() $filename = $file->getFilename(); - $item->updateSize(filesize($path . '/' . $foldername . '/' . $filename) / 1024); + $item->updateSize(filesize($path . '/' . $foldername . '/' . $filename)); } $data[$foldername] = $item; diff --git a/libraries/joomla/cache/storage/file.php b/libraries/joomla/cache/storage/file.php index ac21ff34d3d40..00fad85df6015 100644 --- a/libraries/joomla/cache/storage/file.php +++ b/libraries/joomla/cache/storage/file.php @@ -162,7 +162,7 @@ public function getAll() foreach ($files as $file) { - $item->updateSize(filesize($path . '/' . $folder . '/' . $file) / 1024); + $item->updateSize(filesize($path . '/' . $folder . '/' . $file)); } $data[$folder] = $item; diff --git a/libraries/joomla/cache/storage/helper.php b/libraries/joomla/cache/storage/helper.php index b3d7a9eb411aa..c89c584cc4b7d 100644 --- a/libraries/joomla/cache/storage/helper.php +++ b/libraries/joomla/cache/storage/helper.php @@ -63,7 +63,7 @@ public function __construct($group) */ public function updateSize($size) { - $this->size = number_format((float) $this->size + (float) $size, 2, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); + $this->size += $size; $this->count++; } } diff --git a/libraries/joomla/cache/storage/memcache.php b/libraries/joomla/cache/storage/memcache.php index f6fb1ad7496ef..bee1987c7a731 100644 --- a/libraries/joomla/cache/storage/memcache.php +++ b/libraries/joomla/cache/storage/memcache.php @@ -187,7 +187,7 @@ public function getAll() $item = $data[$group]; } - $item->updateSize($key->size / 1024); + $item->updateSize($key->size); $data[$group] = $item; } diff --git a/libraries/joomla/cache/storage/memcached.php b/libraries/joomla/cache/storage/memcached.php index 92f1831e89c27..40e5d25992d88 100644 --- a/libraries/joomla/cache/storage/memcached.php +++ b/libraries/joomla/cache/storage/memcached.php @@ -206,7 +206,7 @@ public function getAll() $item = $data[$group]; } - $item->updateSize($key->size / 1024); + $item->updateSize($key->size); $data[$group] = $item; } diff --git a/libraries/joomla/cache/storage/redis.php b/libraries/joomla/cache/storage/redis.php index b1913d72d20e2..eb579a259e372 100644 --- a/libraries/joomla/cache/storage/redis.php +++ b/libraries/joomla/cache/storage/redis.php @@ -235,7 +235,7 @@ public function getAll() $item = $data[$group]; } - $item->updateSize(strlen($key)*8/1024); + $item->updateSize(strlen($key)*8); $data[$group] = $item; } } diff --git a/libraries/joomla/cache/storage/wincache.php b/libraries/joomla/cache/storage/wincache.php index c82462879cb6d..2a386f399ee9b 100644 --- a/libraries/joomla/cache/storage/wincache.php +++ b/libraries/joomla/cache/storage/wincache.php @@ -82,7 +82,7 @@ public function getAll() if (isset($key['value_size'])) { - $item->updateSize($key['value_size'] / 1024); + $item->updateSize($key['value_size']); } else { diff --git a/libraries/joomla/cache/storage/xcache.php b/libraries/joomla/cache/storage/xcache.php index 9c5fe3a60626d..fb46d4f6e24fd 100644 --- a/libraries/joomla/cache/storage/xcache.php +++ b/libraries/joomla/cache/storage/xcache.php @@ -101,7 +101,7 @@ public function getAll() $item = $data[$group]; } - $item->updateSize($key['size'] / 1024); + $item->updateSize($key['size']); $data[$group] = $item; }