Merge branch '0.10-maintenance'

2014-02-09 13:14:26 +00:00 · 2014-02-09 13:14:26 +00:00 · 9298d89aed
commit 9298d89aed
parent 23d9b33e92 964c4a37c0
3 changed files with 20 additions and 2 deletions
--- a/flask/helpers.py
+++ b/flask/helpers.py
@ -615,6 +615,8 @@ def send_from_directory(directory, filename, **options):
                    forwarded to :func:`send_file`.
    """
    filename = safe_join(directory, filename)
+    if not os.path.isabs(filename):
+        filename = os.path.join(current_app.root_path, filename)
    if not os.path.isfile(filename):
        raise NotFound()
    options.setdefault('conditional', True)