From 39fc52de6531cf6fd18d7c486b8389e075ca1dae Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 13 Jan 2011 01:08:28 +0000
Subject: [PATCH] - Patch #1015150 by redndahead: clean-up 'getsize' remnants
since it has been removed.
---
modules/image/image.module | 4 ----
modules/image/image.test | 1 -
modules/system/system.admin.inc | 1 -
3 files changed, 6 deletions(-)
diff --git a/modules/image/image.module b/modules/image/image.module
index 4ca0e3495800..23f2e9b5dc1b 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -189,7 +189,6 @@ function image_theme() {
'alt' => '',
'title' => NULL,
'attributes' => array(),
- 'getsize' => TRUE,
),
),
@@ -1082,8 +1081,6 @@ function image_effect_apply($image, $effect) {
* - title: The title text is displayed when the image is hovered in some
* popular browsers.
* - attributes: Associative array of attributes to be placed in the img tag.
- * - getsize: If set to TRUE, the image's dimension are fetched and added as
- * width/height attributes.
*
* @ingroup themeable
*/
@@ -1091,7 +1088,6 @@ function theme_image_style($variables) {
$style_name = $variables['style_name'];
$path = $variables['path'];
- // theme_image() can only honor the $getsize parameter with local file paths.
// The derivative image is not created until it has been requested so the file
// may not yet exist, in this case we just fallback to the URL.
$style_path = image_style_path($style_name, $path);
diff --git a/modules/image/image.test b/modules/image/image.test
index 33c1000c1488..7529add75250 100644
--- a/modules/image/image.test
+++ b/modules/image/image.test
@@ -695,7 +695,6 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
// image style callback paths.
$this->drupalGet(image_style_url('thumbnail', $image_uri));
$image_info['path'] = image_style_path('thumbnail', $image_uri);
- $image_info['getsize'] = FALSE;
$default_output = theme('image', $image_info);
$this->drupalGet('node/' . $nid);
$this->assertRaw($default_output, t('Image style thumbnail formatter displaying correctly on full node view.'));
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 3be8ea1840fb..d40a6e070236 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -158,7 +158,6 @@ function system_themes_page() {
'alt' => t('Screenshot for !theme theme', array('!theme' => $theme->info['name'])),
'title' => t('Screenshot for !theme theme', array('!theme' => $theme->info['name'])),
'attributes' => array('class' => array('screenshot')),
- 'getsize' => FALSE,
);
break;
}
--
GitLab