diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-21 20:50:43 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-21 20:50:43 +0000 |
| commit | 8a05dce6ab7568df828e21cfe1f01592785212d0 (patch) | |
| tree | 81bd6bff095a85c6c06d56f8cc2a18ec9fb17b7c /modules | |
| parent | c5156e1164d3111f2f6b729471682119470672e5 (diff) | |
| download | brdo-8a05dce6ab7568df828e21cfe1f01592785212d0.tar.gz brdo-8a05dce6ab7568df828e21cfe1f01592785212d0.tar.bz2 | |
#563382 by eMPee584, eojthebrave, drewish: Fixed when editing image style, link to sample image broken
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/image/image.admin.inc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc index 613118ad9..ae910e7a9 100644 --- a/modules/image/image.admin.inc +++ b/modules/image/image.admin.inc @@ -792,24 +792,25 @@ function theme_image_style_preview($variables) { $preview_attributes['style'] = 'width: ' . $preview_width . 'px; height: ' . $preview_height . 'px;'; // In the previews, timestamps are added to prevent caching of images. - $output = ''; - $output .= '<div class="image-style-preview preview clearfix">'; + $output = '<div class="image-style-preview preview clearfix">'; // Build the preview of the original image. + $original_url = file_create_url($original_path); $output .= '<div class="preview-image-wrapper">'; - $output .= t('original') . ' (' . l(t('view actual size'), $original_path) . ')'; + $output .= t('original') . ' (' . l(t('view actual size'), $original_url) . ')'; $output .= '<div class="preview-image original-image" style="' . $original_attributes['style'] . '">'; - $output .= '<a href="' . url($original_path) . '?' . time() . '">' . theme('image', array('path' => $original_path . '?' . time(), 'alt' => t('Sample original image'), 'title' => '', 'attributes' => $original_attributes)) . '</a>'; + $output .= '<a href="' . $original_url . '">' . theme('image', array('path' => $original_path, 'alt' => t('Sample original image'), 'title' => '', 'attributes' => $original_attributes)) . '</a>'; $output .= '<div class="height" style="height: ' . $original_height . 'px"><span>' . $original_image['height'] . 'px</span></div>'; $output .= '<div class="width" style="width: ' . $original_width . 'px"><span>' . $original_image['width'] . 'px</span></div>'; $output .= '</div>'; // End preview-image. $output .= '</div>'; // End preview-image-wrapper. // Build the preview of the image style. + $preview_url = file_create_url($preview_file) . '?cache_bypass=' . REQUEST_TIME; $output .= '<div class="preview-image-wrapper">'; $output .= check_plain($style['name']) . ' (' . l(t('view actual size'), file_create_url($preview_file) . '?' . time()) . ')'; $output .= '<div class="preview-image modified-image" style="' . $preview_attributes['style'] . '">'; - $output .= '<a href="' . file_create_url($preview_file) . '?' . time() . '">' . theme('image', array('path' => file_create_url($preview_file) . '?' . time(), 'alt' => t('Sample modified image'), 'title' => '', 'attributes' => $preview_attributes)) . '</a>'; + $output .= '<a href="' . file_create_url($preview_file) . '?' . time() . '">' . theme('image', array('path' => $preview_url, 'alt' => t('Sample modified image'), 'title' => '', 'attributes' => $preview_attributes)) . '</a>'; $output .= '<div class="height" style="height: ' . $preview_height . 'px"><span>' . $preview_image['height'] . 'px</span></div>'; $output .= '<div class="width" style="width: ' . $preview_width . 'px"><span>' . $preview_image['width'] . 'px</span></div>'; $output .= '</div>'; // End preview-image. |