Fixed merge conflict when cherry picking 6849595

ckan · Jul 23, 2012 · 970c9b2 · 970c9b2
1 parent a351034
commit 970c9b2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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)