diff options
Diffstat (limited to 'modules/image/image.module')
| -rw-r--r-- | modules/image/image.module | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/image/image.module b/modules/image/image.module index c9415447b..445e8d0ea 100644 --- a/modules/image/image.module +++ b/modules/image/image.module @@ -1012,10 +1012,14 @@ function image_style_flush($style) { */ function image_style_url($style_name, $path) { $uri = image_style_path($style_name, $path); + + // The passed-in $path variable can be either a relative path or a full URI. + $original_uri = file_uri_scheme($path) ? file_stream_wrapper_uri_normalize($path) : file_build_uri($path); + // The token query is added even if the 'image_allow_insecure_derivatives' // variable is TRUE, so that the emitted links remain valid if it is changed // back to the default FALSE. - $token_query = array(IMAGE_DERIVATIVE_TOKEN => image_style_path_token($style_name, file_stream_wrapper_uri_normalize($path))); + $token_query = array(IMAGE_DERIVATIVE_TOKEN => image_style_path_token($style_name, $original_uri)); // If not using clean URLs, the image derivative callback is only available // with the query string. If the file does not exist, use url() to ensure |