Changeset d481d092b9a7ee97bb2d9b4529c42fe370346e32

Show
Ignore:
Timestamp:
01/13/08 05:15:11 (1 year ago)
Author:
William McBrine <wmcbrine@gmail.com>
git-committer:
William McBrine <wmcbrine@gmail.com> 1200222911 -0500
git-parent:

[5d38aa0848c8b9c42e34c11f6856097b9a5ebc32], [43e45ec62efe9d2e0117c108b01d82b9046a0fda]

git-author:
William McBrine <wmcbrine@gmail.com> 1200222911 -0500
Message:

Merge branch 'master' into subfolders-8.3

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/photo/photo.py

    reea6102 r43e45ec  
    108108 
    109109        path, query = handler.path.split('?') 
    110         infile = container['path'] + unquote(path)[len(name) + 1:] 
     110        infile = os.path.join(os.path.normpath(container['path']), 
     111                              unquote(path)[len(name) + 2:]) 
    111112        opts = cgi.parse_qs(query) 
    112113