Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Make sure the id is safe before setting the filename as id"

This reverts commit 02693f1.

Conflicts:
	CHANGES.rst
  • Loading branch information...
commit c26ae4fcee48266b2131b9ded86373f5649850af 1 parent ff23257
@tdesvenain tdesvenain authored
Showing with 2 additions and 7 deletions.
  1. +2 −5 CHANGES.rst
  2. +0 −2  src/plone/app/blob/field.py
View
7 CHANGES.rst
@@ -7,9 +7,6 @@ Changelog
- Make sure mimetype is not None and use use filename for detection if available.
[tschanzt]
-- Make sure the id is safe before setting the filename as id
- [pbauer]
-
1.5.8 (2013-04-06)
------------------
@@ -32,8 +29,8 @@ Changelog
- Fix BLOB migration when LinguaPlone is installed.
Also for ATFile.
- CAUTION: when the fix was discussed with witsch,
- he pointed to the fact that the files would be
+ CAUTION: when the fix was discussed with witsch,
+ he pointed to the fact that the files would be
entirely loaded in memory during migration.
This could potentially eat too much memory.
[gotcha]
View
2  src/plone/app/blob/field.py
@@ -1,5 +1,4 @@
from os import fstat
-from zope.container.interfaces import INameChooser
from zope.interface import implements
from StringIO import StringIO
from Acquisition import Implicit, aq_base
@@ -275,7 +274,6 @@ def fixAutoId(self, instance):
filename = IUserPreferredFileNameNormalizer(request).normalize(filename)
if filename and not filename == instance.getId():
# a file name was given, so the instance needs to be renamed...
- filename = INameChooser(instance.__parent__).chooseName(filename, instance)
instance.setId(filename)
security.declareProtected(View, 'download')

1 comment on commit c26ae4f

@mister-roboto

TESTS FAILED
Mr.roboto url : http://jenkins.plone.org/roboto/get_info?push=b0aa8a96c28f4e5baec53d7aa673d656
kgs-plone.app.blob-plone-4.2-python-2.6 kgs [SUCCESS]
kgs-plone.app.blob-plone-4.2-python-2.7 kgs [SUCCESS]
kgs-plone.app.blob-plone-4.3-python-2.6 kgs [FAILURE]
kgs-plone.app.blob-plone-4.3-python-2.7 kgs [FAILURE]
kgs-plone.app.blob-plone-5.0-python-2.7 kgs [FAILURE]

Please sign in to comment.
Something went wrong with that request. Please try again.