Merge branch 'master' into v0.9

1 files changed, 6 insertions, 0 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 79d3054b3..ea2eda462 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -62,6 +62,7 @@ from archaeological_operations.forms import DashboardForm as DashboardFormOpe
 from archaeological_files.forms import DashboardForm as DashboardFormFile
 
 from ishtar_common.forms import FinalForm, FinalDeleteForm
+from ishtar_common.utils import get_random_item_image_link
 from ishtar_common import forms_common as forms
 from ishtar_common import wizards
 from ishtar_common.models import HistoryError, PRIVATE_FIELDS, \
@@ -81,6 +82,11 @@ def index(request):
     profile = get_current_profile()
     if hasattr(profile, 'homepage') and profile.homepage:
         dct['homepage'] = markdown(profile.homepage)
+        if '{random_image}' in dct['homepage']:
+            dct['homepage'] = dct['homepage'].replace(
+                '{random_image}', get_random_item_image_link())
+    else:
+        dct['random_image'] = get_random_item_image_link()
     try:
         return render_to_response('index.html', dct,
                                   context_instance=RequestContext(request))