Index: inline.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/inline/inline.module,v
retrieving revision 1.19.2.7
diff -u -r1.19.2.7 inline.module
--- inline.module	18 Apr 2007 11:22:27 -0000	1.19.2.7
+++ inline.module	7 Jun 2008 19:01:18 -0000
@@ -73,17 +73,32 @@
     ),
   );
   
+  if (module_exists('imagecache') && function_exists('imagecache_presets')) {
+    $imagecache_path = array('!presets' => url('admin/build/imagecache'));
+  }
+  else {
+    $imagecache_path = array('!presets' => url('admin/settings/imagecache'));
+  }
   $form['inline']['upload']['image_scaling'] = array(
     '#type' => 'fieldset',
     '#title' => t('Image dimensions and scaling'),
     '#collapsible' => true,
-    '#description' => (module_exists('imagecache') ? t('Select the <a href="!presets">Imagecache presets</a> to use for inlined images.', array('!presets' => url('admin/settings/imagecache'))) : t('<strong>Note:</strong> If <a href="!imagecache">Imagecache</a> module is installed, Inline provides support for image scaling.', array('!imagecache' => url('http://drupal.org/project/imagecache')))),
+    '#description' => (module_exists('imagecache') ? t('Select the <a href="!presets">Imagecache presets</a> to use for inlined images.', $imagecache_path) : t('<strong>Note:</strong> If <a href="!imagecache">Imagecache</a> module is installed, Inline provides support for image scaling.', array('!imagecache' => url('http://drupal.org/project/imagecache')))),
   );
   
   if (module_exists('imagecache')) {
     $options     = array();
     $options[''] = 'No Imagecache processing';
-    $presets     = _imagecache_get_presets();
+    $presets     = array();
+    if (function_exists('imagecache_presets')) {
+      $rules = imagecache_presets();
+      foreach ($rules as $preset_id => $preset_info) {
+        $presets[$preset_id] = $preset_info['presetname'];
+      }
+    }
+    else {
+      $presets = _imagecache_get_presets();
+    }
     foreach ($presets as $id => $name) {
       $options[$name] = $name;
     }