summaryrefslogtreecommitdiffstats
path: root/core/views_caves.py
diff options
context:
space:
mode:
authorexpo <expo@expobox.potato.hut>2016-06-09 04:16:46 +0100
committerexpo <expo@expobox.potato.hut>2016-06-09 04:16:46 +0100
commit4320e7629813aef22a8778b12efdb593687542da (patch)
tree1a625d478f7c21504c98e6a91ccfd0dfca79787e /core/views_caves.py
parentc3952cf3e75ae0cfea234eb6ff5ee595d4297e82 (diff)
parent32f3dac62196e3cad7b9a9b1b949d6970529666f (diff)
downloadtroggle-4320e7629813aef22a8778b12efdb593687542da.tar.gz
troggle-4320e7629813aef22a8778b12efdb593687542da.tar.bz2
troggle-4320e7629813aef22a8778b12efdb593687542da.zip
merge serve changes
HGerver canges Enter commit message. Lines beginning with 'HG:' are removed.
Diffstat (limited to 'core/views_caves.py')
-rw-r--r--core/views_caves.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/views_caves.py b/core/views_caves.py
index 511deb0..e3df0b3 100644
--- a/core/views_caves.py
+++ b/core/views_caves.py
@@ -63,7 +63,7 @@ def cave(request, cave_id='', offical_name=''):
if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated():
return render_with_context(request,'nonpublic.html', {'instance': cave, 'cavepage': True})
else:
- return render_with_context(request,'cave.html', {'cave': cave, 'cavepage': True})
+ return render_with_context(request,'cave.html', {'settings': settings, 'cave': cave, 'cavepage': True})
def caveEntrance(request, slug):
cave = Cave.objects.get(caveslug__slug = slug)