// Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) {
- goaway($_SESSION['return_url']);
+ goaway('/message');
}
$cmd = $a->argv[1];
info(L10n::t('Message deleted.') . EOL);
}
- //goaway(System::baseUrl(true) . '/message' );
- goaway($_SESSION['return_url']);
+ goaway('/message' );
} else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
info(L10n::t('Conversation removed.') . EOL);
}
}
- //goaway(System::baseUrl(true) . '/message' );
- goaway($_SESSION['return_url']);
+ goaway('/message' );
}
}
'$id' => $rr['id'],
'$from_name' => $participants,
'$from_url' => Contact::magicLink($rr['url']),
- '$from_addr' => $contact['addr'],
+ '$from_addr' => defaults($contact, 'addr', ''),
'$sparkle' => ' sparkle',
'$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
'$subject' => $subject_e,