diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-08-04 10:41:00 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-08-04 10:41:00 +0100 |
| commit | 71c1143e8785954ea00a62aeb755ca7d8fa47e56 (patch) | |
| tree | c813b1fe3590314fcb1f20a30811d5de92871583 /inc/media.php | |
| parent | d637819dca760b20f6e53e5847a92d08d8d15b8c (diff) | |
| parent | 90d5fa676926189b265430239dca3b7ba668b30b (diff) | |
| download | rpg-71c1143e8785954ea00a62aeb755ca7d8fa47e56.tar.gz rpg-71c1143e8785954ea00a62aeb755ca7d8fa47e56.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/media.php b/inc/media.php index 5c84bed4b..ee5c0c1eb 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1900,7 +1900,7 @@ function media_crop_image($file, $ext, $w, $h=0){ */ function media_get_token($id,$w,$h){ // token is only required for modified images - if ($w || $h) { + if ($w || $h || media_isexternal($id)) { $token = $id; if ($w) $token .= '.'.$w; if ($h) $token .= '.'.$h; |