9,10d8
<     case 'admin/modules#description':
<       return t('Allows users to insert uploaded files inline. Requires upload.module to work');
19c17,30
< function inline_settings() {
---
> function inline_menu($may_cache) {
>  $items[] = array(
>   'path' => 'admin/settings/inline',
>   'title' => t('Inline'),
>   'description' => t('Inline settings'),
>   'callback' => 'drupal_get_form',
>   'callback arguments' => 'inline_admin_settings',
>   'access' => user_access('administer site configuration'),
>   'type' => MENU_NORMAL_ITEM
>  );
>  return($items);
> }
> 
> function inline_admin_settings() {
39c50
<   return $form;
---
>   return system_settings_form($form);
43,53c54,64
<   if (isset($form['type'])) {
<     if ($form['type']['#value'] .'_node_settings' == $form_id) {
<       $form['workflow']['upload_inline_'. $form['type']['#value']] = array(
<           '#type' => 'radios',
<           '#title' => t('Display attachments inline automatically'),
<           '#default_value' => variable_get('upload_inline_'. $form['type']['#value'], 0),
<           '#options' => array(t('Disabled'), t('Only in teaser'), t('Only in body'), t('In teaser and body')),
<           '#description' => t('Whether or not uploaded images should be shown inline. Make sure you set the dimensions at %settings_url', array('%settings_url' => l(t('inline settings'), 'admin/settings/inline'))),
<       );
<     }
<   }
---
>  if ($form_id == 'node_type_form') {
>   $node_type = $form['old_type']['#value'];
> 
>   $form['workflow']['inline_settings'] = array(
>    '#type' => 'radios',
>    '#title' => t('Display attachments inline automatically'),
>    '#default_value' => variable_get('inline_settings_'. $node_type, 0),
>    '#options' => array(t('Disabled'), t('Only in teaser'), t('Only in body'), t('In teaser and body')),
>    '#description' => t('Whether or not uploaded images should be shown inline.'),
>   );  
>  }
111,112c122,124
< function inline_nodeapi(&$node, $op, $arg) {
<   if(is_array($node->files) && $op == 'view') {
---
> 
> function inline_nodeapi(&$node, $op) {
>  if (is_array($node->files) && $op == 'alter') {
114,115c126,127
<     foreach (filter_list_format($node->format) as $filter) {
<       if ($filter->module == 'inline') {
---
> #    foreach (filter_list_format($node->format) as $filter) {
> #      if ($filter->module == 'inline') {
118,120c130,132
<         break;
<       }
<     }
---
> #        break;
> #      }
> #    }
242a255,256
> 
> 
249a264
> 
264a280
>