? .buildpath
? .project
? .settings
? 865970.patch
? 936246.patch
? 936836.patch
? dblog_clear_confirm.patch
? taxonomy_autocomplete.patch
? ui.borked.patch
? ui.working.patch
? sites/all/modules/crud.inc
? sites/all/modules/devel
? sites/all/modules/extensible.patch
? sites/all/modules/module
? sites/all/modules/views
? sites/all/modules/views.tar.gz
? sites/default/files
? sites/default/settings.php
Index: modules/image/image.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.admin.inc,v
retrieving revision 1.25
diff -u -p -r1.25 image.admin.inc
--- modules/image/image.admin.inc	4 Oct 2010 18:00:45 -0000	1.25
+++ modules/image/image.admin.inc	9 Oct 2010 23:43:56 -0000
@@ -793,7 +793,7 @@ function theme_image_style_preview($vari
   $output .= '<div class="preview-image-wrapper">';
   $output .= t('original') . ' (' . l(t('view actual size'), $original_path) . ')';
   $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="' . file_create_url($original_path) . '?' . REQUEST_TIME . '">' . theme('image', array('path' => file_create_url($original_path) . '?' . REQUEST_TIME, '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.
@@ -803,7 +803,7 @@ function theme_image_style_preview($vari
   $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) . '?' . REQUEST_TIME . '">' . theme('image', array('path' => file_create_url($preview_file) . '?' . REQUEST_TIME, '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.
Index: modules/image/image.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.test,v
retrieving revision 1.31
diff -u -p -r1.31 image.test
--- modules/image/image.test	22 Sep 2010 03:24:09 -0000	1.31
+++ modules/image/image.test	9 Oct 2010 23:43:56 -0000
@@ -381,6 +381,11 @@ class ImageAdminStylesUnitTest extends I
     $this->drupalPost('admin/config/media/image-styles/add', $edit, t('Create new style'));
     $this->assertRaw(t('Style %name was created.', array('%name' => $style_name)), t('Image style successfully created.'));
 
+    // Assert the sample image URL is build like this: http://host/path_to_image_module/sample.png
+    $sample_image = variable_get('image_style_preview_image', drupal_get_path('module', 'image') . '/sample.png');
+    $image_image_file_url = $GLOBALS['base_url'] . '/' . $sample_image;
+    $this->assertRaw($image_image_file_url, t('Sample image was found with file URL %image_file_url.', array('%image_file_url' => $image_image_file_url)));
+
     // Add effect form.
 
     // Add each sample effect to the style.