51c51,52
<   if ($may_cache) {
---
> //  if ($may_cache) {
> if (true) {
190c191
< 
---
> /*
197a199,216
> */
>     $items[] = array('path' => 'newsletter/confirm/add',
>       'title' => t('Confirm newsletter subscriptions'),
>       'access' => user_access('access content'),
>       'callback' => 'drupal_get_form',
>       'callback arguments' => array('simplenews_confirm_add_subscription'),
>       'type' => MENU_CALLBACK,
>     );
> 
>     $items[] = array('path' => 'newsletter/confirm/remove',
>       'title' => t('Confirm newsletter subscriptions'),
>       'access' => user_access('access content'),
>       'callback' => 'drupal_get_form',
>       'callback arguments' => array('simplenews_confirm_remove_subscription'),
>       'type' => MENU_CALLBACK,
>     );
> 
> 
2170,2172c2189,2192
< function simplenews_confirm_subscription($op1 = NULL, $op2 = NULL) {
<   $md5 = drupal_substr($op2, 0, 10);
<   list($snid, $tid) = explode('t', drupal_substr($op2, 10));
---
> function simplenews_confirm_add_subscription($op1 = NULL) {
> 
>   $md5 = drupal_substr($op1, 0, 10);
>   list($snid, $tid) = explode('t', drupal_substr($op1, 10));
2182,2187c2202
<     if ($op1 == 'remove') {
<       return simplenews_confirm_removal_form($subs->mail, $newsletter);
<     }
<     elseif ($op1 == 'add') {
<       return simplenews_confirm_add_form($subs->mail, $newsletter);
<     }
---
>     return simplenews_confirm_add_form($subs->mail, $newsletter);
2191c2206
<   drupal_not_found();
---
>   //drupal_not_found();
2194a2210,2231
> function simplenews_confirm_remove_subscription($op1 = NULL) {
> 
>   $md5 = drupal_substr($op1, 0, 10);
>   list($snid, $tid) = explode('t', drupal_substr($op1, 10));
> 
>   $result = db_query('SELECT snid, mail FROM {simplenews_subscriptions} WHERE snid = %d', $snid);
>   if (!($subs = db_fetch_object($result))) {
>     drupal_not_found();
>     return;
>   }
> 
>   if ($md5 == drupal_substr(md5($subs->mail . simplenews_private_key()), 0, 10)) {
>     $newsletter = taxonomy_get_term($tid);
>     return simplenews_confirm_removal_form($subs->mail, $newsletter);
>   }
> 
>   // If md5 didn't match, do a not found.
>   //drupal_not_found();
>   return;
> }
> 
> 
2203c2240
<   return confirm_form('simplenews_confirm_add_form',
---
>   return confirm_form(
2217c2254
< function simplenews_confirm_add_form_submit($form_id, $form_values) {
---
> function simplenews_confirm_add_subscription_submit($form_id, $form_values) {
2231c2268
<   return confirm_form('simplenews_confirm_removal_form',
---
>   return confirm_form(
2245c2282
< function simplenews_confirm_removal_form_submit($form_id, $form_values) {
---
> function simplenews_confirm_remove_subscription_submit($form_id, $form_values) {
2366c2403
< }
\ No newline at end of file
---
> }