diff -u b/core/modules/image/image.admin.inc b/core/modules/image/image.admin.inc --- b/core/modules/image/image.admin.inc +++ b/core/modules/image/image.admin.inc @@ -234,7 +234,7 @@ '#theme' => 'image_resize_summary', '#data' => $variables['data'], ); - return drupal_render($image_resize_summary) . ' ' . ($variables['data']['upscale'] ? '(' . t('upscaling allowed') . ')' : ''); + return drupal_render($image_resize_summary) . ($variables['data']['upscale'] ? ' (' . t('upscaling allowed') . ')' : ''); } /** @@ -247,13 +247,11 @@ * @ingroup themeable */ function theme_image_scale_and_crop_summary($variables) { - $data = $variables['data']; - $data['upscale'] = isset($data['upscale']) ? $data['upscale'] : TRUE; - $image_resize_summary = array( - '#theme' => 'image_resize_summary', - '#data' => $data, + $image_scale_summary = array( + '#theme' => 'image_scale_summary', + '#data' => $variables['data'], ); - return drupal_render($image_resize_summary) . ' ' . (!empty($variables['data']['upscale']) ? t('(upscaling allowed)') : ''); + return drupal_render($image_scale_summary); } /**