diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-07-14 08:10:28 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-07-14 08:10:28 -0400 |
| commit | 4761adf8eee9feadd77599682ef192b56520d11d (patch) | |
| tree | 022a921d20ddd26fb226351cadedf9a8dfe9e971 /classes/TidypicsImage.php | |
| parent | 4448f072dc6149a62b602e60e766fd00c2b6af89 (diff) | |
| parent | c1da32e6a7e2f4a15a3b2d69cd38a1c0c164a99d (diff) | |
| download | elgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.gz elgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.bz2 | |
Pulling in several small fixes from Brett's fork
Diffstat (limited to 'classes/TidypicsImage.php')
| -rw-r--r-- | classes/TidypicsImage.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index c0b5de723..26a3483a9 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -90,7 +90,11 @@ class TidypicsImage extends ElggFile { * @return string */ public function getTitle() { - return $this->title; + if ($this->title) { + return $this->title; + } else { + return $this->originalfilename; + } } /** @@ -244,6 +248,11 @@ class TidypicsImage extends ElggFile { trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING); throw new Exception(elgg_echo('tidypics:image_pixels')); } + + // make sure file fits quota + if (!tp_upload_check_quota($data['size'], elgg_get_logged_in_user_guid())) { + throw new Exception(elgg_echo('tidypics:cannot_upload_exceeds_quota')); + } } /** |