From cc674fcc5f1137401199cf9029da48c8893be8bd Mon Sep 17 00:00:00 2001
From: krassowski <krassowski.michal@gmail.com>
Date: Thu, 29 Jun 2017 12:07:15 +0200
Subject: [PATCH] Move variable substitution to template so the base for
 edition has original variables not their values

---
 website/templates/text_entry.html | 2 +-
 website/views/cms.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/templates/text_entry.html b/website/templates/text_entry.html
index 6d07538ad..726eaf9ed 100644
--- a/website/templates/text_entry.html
+++ b/website/templates/text_entry.html
@@ -8,7 +8,7 @@
       </div>
     {% endif %}
 
-    <div class="content">{{ text_entry(id) | safe }}</div>
+    <div class="content">{{ text_entry(id) | safe | substitute_allowed_variables | safe }}</div>
 
     {% if current_user.is_admin %}
       <div class="alert alert-warning feedback" role="alert"></div>
diff --git a/website/views/cms.py b/website/views/cms.py
index f9d43f090..8e9a82cc6 100644
--- a/website/views/cms.py
+++ b/website/views/cms.py
@@ -176,7 +176,7 @@ def _text_entry(name):
             if current_user.is_admin:
                 return 'Please, click the pencil icon to add text here.'
             return ''
-        return substitute_variables(entry.content)
+        return entry.content
 
     @route('/admin/save_text_entry/', methods=['POST'])
     @admin_only