summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--imagecache.install4
-rw-r--r--imagecache.module2
-rw-r--r--imagecache_actions.inc3
-rw-r--r--imagecache_ui.module2
4 files changed, 4 insertions, 7 deletions
diff --git a/imagecache.install b/imagecache.install
index 8bfb073..e3552b2 100644
--- a/imagecache.install
+++ b/imagecache.install
@@ -216,8 +216,8 @@ function imagecache_update_4() {
$result = db_query("SELECT * FROM {imagecache_action}");
while ($row = db_fetch_array($result)) {
$data = unserialize($row['data']);
- // Keep scale and crop and the old scale function seperate... I don't really want to break BC with
- // the 2.x update. We'll deprecate this version.
+
+ // remove function from data if present;
$function = $data['function'];
unset($data['function']);
$data = serialize($data);
diff --git a/imagecache.module b/imagecache.module
index 3352d86..4a9a6fd 100644
--- a/imagecache.module
+++ b/imagecache.module
@@ -460,7 +460,6 @@ function imagecache_build_derivative($actions, $src, $dst) {
return false;
}
-
foreach ($actions as $action) {
if (!empty($action['data'])) {
// QuickSketch, why do these run first/twice? - dopry.
@@ -486,6 +485,7 @@ function imagecache_build_derivative($actions, $src, $dst) {
}
return false;
}
+
return true;
}
diff --git a/imagecache_actions.inc b/imagecache_actions.inc
index aaf78ff..ebcbcaf 100644
--- a/imagecache_actions.inc
+++ b/imagecache_actions.inc
@@ -46,9 +46,6 @@ function theme_imagecache_scale_and_crop($element) {
function imagecache_scale_and_crop_image(&$image, $data) {
- // Set impossibly large values if the width and height aren't set.
- $data['width'] = $data['width'] ? $data['width'] : 9999999;
- $data['height'] = $data['height'] ? $data['height'] : 9999999;
if (!imageapi_image_scale_and_crop($image, $data['width'], $data['height'])) {
watchdog('imagecache', t('imagecache_scale_and_crop failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, true))), WATCHDOG_ERROR);
return false;
diff --git a/imagecache_ui.module b/imagecache_ui.module
index bace964..7b3f0c7 100644
--- a/imagecache_ui.module
+++ b/imagecache_ui.module
@@ -17,7 +17,7 @@ function imagecache_ui_menu($may_cache) {
if ($may_cache) {
$items[] = array(
'path' => 'admin/build/imagecache',
- 'title' => t('Imagecache Presets'),
+ 'title' => t('Imagecache'),
'description' => t('Administer imagecache presets and actions.'),
'callback' => 'imagecache_ui_presets',
'access' => user_access('administer imagecache'),