merging changes

This commit is contained in:
rolux 2011-08-19 06:40:49 +00:00
commit 5366941bc1

View file

@ -529,7 +529,7 @@ class Stream(models.Model):
def json(self):
if settings.XSENDFILE or settings.XACCELREDIRECT:
base_url = '/%s' % self.file.itemId
base_url = '/%s' % self.file.item.itemId
else:
base_url = os.path.dirname(self.video.url)
return {