diff options
| author | rvelices <rv-github@modusoptimus.com> | 2013-02-02 07:09:52 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2013-02-02 07:09:52 +0000 |
| commit | 5b22fcea0eff97187eacd965a54d04d8c2568b6a (patch) | |
| tree | 53599fa6167470f51b3cea570be79c4e1203ce60 /include/derivative.inc.php | |
| parent | 21c97f38588b3350e9ebc1e37a985b64fd5b9f1b (diff) | |
feature 2831: simple way to protect urls of originals
git-svn-id: http://piwigo.org/svn/trunk@20516 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/derivative.inc.php')
| -rw-r--r-- | include/derivative.inc.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/derivative.inc.php b/include/derivative.inc.php index b8b68ce4e..1625d5860 100644 --- a/include/derivative.inc.php +++ b/include/derivative.inc.php @@ -19,7 +19,7 @@ // | USA. | // +-----------------------------------------------------------------------+ -/*A source image is used to get a derivative image. A source image is either the original file for a jpg or a +/*A source image is used to get a derivative image. A source image is either the original file for a jpg or a 'representative' image of a non image file or a standard icon for the non-image file.*/ final class SrcImage { @@ -78,7 +78,7 @@ final class SrcImage $width = $infos['height']; $height = $infos['width']; } - + $this->size = array($width, $height); } elseif (!array_key_exists('width', $infos)) @@ -106,7 +106,7 @@ final class SrcImage function get_url() { $url = get_root_url().$this->rel_path; - if ($this->flags & self::IS_ORIGINAL) + if ( !($this->flags & self::IS_MIMETYPE) ) { $url = trigger_event('get_src_image_url', $url, $this); } @@ -170,7 +170,7 @@ final class DerivativeImage return self::url(IMG_THUMB, $infos); } - /** + /** @return derivative image url @param type string of standard derivative param type (e.g. IMG_???) or a DerivativeParams object @param infos assoc array of data from images table or a SrcImage object |