eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Documentation and more understandable code.

This commit is contained in:
Mikael Nordfeldth 2015-03-04 13:29:18 +01:00
parent 286b54e527
commit f6df1f1dd3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/imagefile.php
View File

@ -61,11 +61,16 @@ class ImageFile
{ {
$this->id = $id; $this->id = $id;
if (!empty($this->id)) { if (!empty($this->id)) {
$this->fileRecord = File::getKV('id', $this->id); $this->fileRecord = new File();
if (!$this->fileRecord instanceof File) { $this->fileRecord->id = $this->id;
throw new ServerException('Expected File object did not exist.'); if (!$this->find(true)) {
// If we have set an ID, we need that ID to exist!
throw new NoResultException($this->fileRecord);
} }
} }
// These do not have to be the same as fileRecord->filename for example,
// since we may have generated an image source file from something else!
$this->filepath = $filepath; $this->filepath = $filepath;
$this->filename = basename($filepath); $this->filename = basename($filepath);