Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Commit

Permalink
Renames signature.asc to pubkey.asc
Browse files Browse the repository at this point in the history
Removes pubkey attachment debug declaration

Fixes #39 along with e272d38
  • Loading branch information
Niklas Femerstrand committed Oct 9, 2013
1 parent e272d38 commit 7bb10df
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion js/rc_openpgpjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ if(window.rcmail) {
function removePublicKeyAttachment() {
$("#attachment-list").each(function() {
$(this).find('li').each(function() {
if ($(this).text().indexOf('signature.asc') >= 0) {
if ($(this).text().indexOf('pubkey.asc') >= 0) {
rcmail.command('remove-attachment', $(this).attr('id'));
return false;
}
Expand Down
4 changes: 1 addition & 3 deletions rc_openpgpjs.php
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,8 @@ function preferences_save($p)
* Creates a dummy publick key attachment
*/
function message_compose($args) {
$dbg = print_r($args, true);

if ($f = $this->create_pubkey_dummy()) {
$args['attachments'][] = array('path' => $f, 'name' => "signature.asc", 'mimetype' => "text/plain");
$args['attachments'][] = array('path' => $f, 'name' => "pubkey.asc", 'mimetype' => "text/plain");
}
return $args;
}
Expand Down

0 comments on commit 7bb10df

Please sign in to comment.