Integration with Imagecache 2

Here is moddification latest Inline for Imagecache 2 (add + lines into inline.module from line 83):

  if (module_exists('imagecache')) {
    $options     = array();
    $options[''] = 'No Imagecache processing';
+    if (function_exists('_imagecache_get_presets')) {
+      // for Imagecache < 2.0
+      $presets   = _imagecache_get_presets();
+    }
+    else {
+      // for Imagecache 2.0
+      $presets = array();
+      $presets_tmp = imagecache_presets();
+      foreach ($presets_tmp as $id => $preset) {
+        $presets[$preset['presetid']] = $preset['presetname'];
+      }
+    }
    foreach ($presets as $id => $name) {
      $options[$name] = $name;
    }

I need a proper patch (see http://drupal.org/patch/create) and I would like to see the same code as in #259471: Update for ImageCache 2 API

Here is patch.

I think you accidentally removed '!presets' => from the fieldset description, so the ImageCache settings path won't be replaced.

In Imagecache 2.0 is path for ImageCache settings admin/build/imagecache. For this reason i use condition which set correct path in '!presets' => array(...). This is work in my installation correctly and i get ImageCache settings page. I testing this only with ImageCache 2.0.

Here is bit moddified patch.

Here :).

oww... now I get it! You've turned $imagecache_path into an array already:

$imagecache_path = array('!presets' => url('admin/settings/imagecache'));

Please don't do that. t() and the arguments to t() belong together. It's okay to prepare $imagecache_path somewhere else, but the overall structure should look like:

$imagecache_path = url('admin/settings/imagecache');
[...]
t('...', array('!presets' => $imagecache_path);

So if the string in t() will ever be updated, one will find the contained argument right next to it.

Thanks to review, here is (i hope) final patch.

Patch applied and is working for me thus far... Thanks havran!

Hm. Patch does not apply against DRUPAL--5, resp. latest development snapshot. Could you re-roll, please?

Here is same patch against DRUPAL-5.

Hrm... much duplicate code. What about attached patch?

Patch #12 worked for me in a couple of different environments:

• Drupal 5.7, ImageCache 5.x-1.6, Thickbox 5.x-1.2
• Drupal 5.7, ImageAPI 5.x-1.2, ImageCache 5.x-2.1, Thickbox 5.x-2.0

Patch applied to latest (2008-Jun-15) 5.x-1.x-dev.

You may note from this that it did not break ImageCache 5.x-1.x compatibility.

Micah

Committed to HEAD, 5.x-2.x, and 5.x-1.x.