hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 03:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2014-02-28 00:28:06 +01:00
parent aa6045104b 5adc7604bb
commit 2df0f9d659
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/media/subdef.php
View File

@@ -95,6 +95,9 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
*/
protected $is_physically_present = false;
/** @var integer */
private $size = 0;
/**
* Players types constants
*/
@@ -162,6 +165,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$this->mime = $datas['mime'];
$this->width = $datas['width'];
$this->height = $datas['height'];
$this->size = $datas['size'];
$this->etag = $datas['etag'];
$this->path = $datas['path'];
$this->url = $datas['url'];
@@ -197,6 +201,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
if ($row) {
$this->width = (int) $row['width'];
$this->size = (int) $row['size'];
$this->height = (int) $row['height'];
$this->mime = $row['mime'];
$this->file = $row['file'];
@@ -222,6 +227,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$datas = [
'mime' => $this->mime
, 'width' => $this->width
, 'size' => $this->size
, 'height' => $this->height
, 'etag' => $this->etag
, 'path' => $this->path
@@ -441,7 +447,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
*/
public function get_size()
{
return (int) @filesize($this->get_pathfile());
return $this->size;
}
/**