From 970c9b22b2f7c93e0a0ad5411b49e683df93ac2b Mon Sep 17 00:00:00 2001 From: Ross Jones Date: Mon, 23 Jul 2012 16:02:25 +0100 Subject: [PATCH] Fixed merge conflict when cherry picking 68495956d19f --- ckan/controllers/storage.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ckan/controllers/storage.py b/ckan/controllers/storage.py index 594d91594bc..85de36750ae 100644 --- a/ckan/controllers/storage.py +++ b/ckan/controllers/storage.py @@ -265,9 +265,11 @@ def get_metadata(self, label): url = "https://%s/%s%s" % (self.ofs.conn.server_name(), bucket, label) else: url = h.url_for('storage_file', - label=label, - qualified=False - ) + label=label, + qualified=False) + + if url.startswith('/'): + url = config.get('ckan.site_url', '') + url if not self.ofs.exists(bucket, label): abort(404) metadata = self.ofs.get_metadata(bucket, label)