95,120c95,118
< function interwiki_menu($may_cache) {
<   $items = array();
<   if ($may_cache) {
<     $items[] = array('path' => 'interwiki',
<       'title' => t('wiki filter prefixes'),
<       'access' => TRUE,
<       'callback' => 'interwiki_list',
<       'type' => MENU_CALLBACK);
<     $items[] = array('path' => 'admin/settings/interwiki',
<       'title' => t('interwiki'),
<       'description' => t('Manage interwiki.'),
<       'access' => user_access('administer interwiki'),
<       'callback' => 'interwiki_admin');
<     $items[] = array('path' => 'admin/settings/interwiki/list',
<       'title' => t('list'),
<       'access' => user_access('administer interwiki'),
<       'callback' => 'interwiki_admin',
<       'type' => MENU_DEFAULT_LOCAL_TASK,
<       'weight' => -10 );
<     $items[] = array('path' => 'admin/settings/interwiki/add',
<       'title' => t('add'),
<       'access' => user_access('administer interwiki'),
<       'callback' => 'interwiki_admin',
<       'type' => MENU_LOCAL_TASK);
<   }
<   return $items;
---
> 
> function interwiki_menu() {
>   $items['interwiki'] = array(
>     'title' => 'Wiki filter prefixes',
>     'access arguments' => array(TRUE),
>     'page callback' => 'interwiki_list',
>     'type' => MENU_CALLBACK);
>   $items['admin/settings/interwiki'] = array(
>     'title' => 'Interwiki',
>     'description' => 'Manage interwiki filters.',
>     'access arguments' => array('administer interwiki'),
>     'page callback' => 'interwiki_admin');
>   $items['admin/settings/interwiki/list'] = array(
>     'title' => 'list',
>     'access arguments' => array('administer interwiki'),
>     'page callback' => 'interwiki_admin',
>     'type' => MENU_DEFAULT_LOCAL_TASK,
>     'weight' => -10 );
>   $items['admin/settings/interwiki/add'] = array(
>     'title' => 'add',
>     'access arguments' => array('administer interwiki'),
>     'page callback' => 'interwiki_admin',
>     'type' => MENU_LOCAL_TASK);
> return $items;
391c389
< function interwiki_edit_form($edit) {
---
> function interwiki_edit_form($form_state, $edit) {
450,451c448,449
< function _interwiki_confirm_del($edit=array()) {
< 	return drupal_get_form('interwiki_delete_confirm_form', $edit['iw_prefix']);
---
> function _interwiki_confirm_del($edit) {
> 	return drupal_get_form('interwiki_delete_confirm_form', $edit);
455c453,454
< function interwiki_delete_confirm_form($iw_prefix) {
---
> function interwiki_delete_confirm_form($form_state, $edit) {
> 
462c461
<     '#value' => $iw_prefix,
---
>     '#value' => $edit[iw_prefix],
501d499
< 
513c511
<   case "delete": // the lower-case "d" in "delete" indicates that this came from a URL, so there's no $_POST variable and therefore no $edit
---
>     case "delete": // the lower-case "d" in "delete" indicates that this came from a URL, so there's no $_POST variable and therefore no $edit