Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deleted files, fix mimetype detection #1346

Merged
merged 1 commit into from
Sep 10, 2016
Merged

Conversation

schiessle
Copy link
Member

detect the correct mimetype of the files in the trashbin, therefore we have to check the filename without the appended timestamp

bug was introduced here: 435cd31

We can't rely on the file cache, because the files in the trash bin are named <filename>.<extension>.d<timestamp> to get the correct mimetype we need to check the real filename without the time stamp when we compile the list.

cc @MorrisJobke @icewind1991

fix #1337

@schiessle schiessle added this to the Nextcloud 11.0 milestone Sep 9, 2016
@mention-bot
Copy link

@schiessle, thanks for your PR! By analyzing the annotation information on this pull request, we identified @icewind1991, @PVince81 and @nickvergessen to be potential reviewers

@schiessle
Copy link
Member Author

Nextcloud 10 is also affected, I will prepare a backport.

…e have to check the filename without the appended timestamp
@MorrisJobke
Copy link
Member

MorrisJobke commented Sep 9, 2016

Tested and works 👍

@MorrisJobke
Copy link
Member

cc @rullzer

@rullzer
Copy link
Member

rullzer commented Sep 10, 2016

LGTM

@rullzer rullzer merged commit ef4eaae into master Sep 10, 2016
@rullzer rullzer deleted the trash-detect-correct-mimetype branch September 10, 2016 12:42
@MorrisJobke
Copy link
Member

@schiessle @karlitschek I would like to see this backported to stable10

@karlitschek
Copy link
Member

please backport 👍

@schiessle
Copy link
Member Author

stable10: #1367

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mimetypes in the trashbin are wrong
5 participants