summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMartin Green <martin.speleo@gmail.com>2022-06-25 01:07:17 +0100
committerMartin Green <martin.speleo@gmail.com>2022-06-25 01:07:17 +0100
commitd607b30953a7b08ea3573067b46956ae5200181f (patch)
tree83536c8e0d8563db987cf15bfe685b4b53922140 /core
parentabdea228995e9b873d0ea60aec275fc8c144f9e9 (diff)
downloadtroggle-d607b30953a7b08ea3573067b46956ae5200181f.tar.gz
troggle-d607b30953a7b08ea3573067b46956ae5200181f.tar.bz2
troggle-d607b30953a7b08ea3573067b46956ae5200181f.zip
Do not allow for the main menu to be overriden, instead display old menu at bottom of page. To do this the id of the main menu was changed from links to menulinks
Diffstat (limited to 'core')
-rw-r--r--core/views/expo.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/views/expo.py b/core/views/expo.py
index 55a34be..00cb6dc 100644
--- a/core/views/expo.py
+++ b/core/views/expo.py
@@ -168,12 +168,9 @@ def expowebpage(request, expowebpath, path):
editable = os.access(expowebpath / path, os.W_OK) # are file permissions writeable?
has_menu = False
- menumatch = re.match(r'(.*)<div id="menu">', body, re.DOTALL + re.IGNORECASE)
- if menumatch:
- has_menu = True
menumatch = re.match(r'(.*)<ul id="links">', body, re.DOTALL + re.IGNORECASE)
if menumatch:
- has_menu = True
+ has_menu = False
#Determine which caves this page relates to
m = re.search(r"(162\d\/[^\/]+)[\/\.]", path, re.DOTALL + re.IGNORECASE)