Fixing error on 404 and search pages caused by new og_image tag

coderedcms/__init__.py

@@ -1,4 +1,4 @@
-release = ['0', '15', '1']
+release = ['0', '15', '2']
 
 __version__ = "{0}.{1}.{2}".format(release[0], release[1], release[2])
 __shortversion__ = "{0}.{1}".format(release[0], release[1])

coderedcms/templatetags/coderedcms_tags.py

@@ -45,16 +45,15 @@ def generate_random_id():
 @register.simple_tag(takes_context=True)
 def og_image(context, page):
     site_url = context['request'].site.root_url
-    if page.og_image:
-        relative_path = page.og_image.get_rendition('original').url
-    elif page.cover_image:
-        relative_path = page.cover_image.get_rendition('original').url
-    elif LayoutSettings.for_site(context['request'].site).logo:
+    if page:
+        if page.og_image:
+            return site_url + page.og_image.get_rendition('original').url
+        elif page.cover_image:
+            return site_url + page.cover_image.get_rendition('original').url
+    if LayoutSettings.for_site(context['request'].site).logo:
         layout_settings = LayoutSettings.for_site(context['request'].site)
-        relative_path = layout_settings.logo.get_rendition('original').url
-    else:
-        return None
-    return site_url + relative_path
+        return site_url + layout_settings.logo.get_rendition('original').url
+    return None
 
 
 @register.simple_tag

docs/releases/index.rst

@@ -17,6 +17,7 @@ CodeRed CMS follows the ``[major].[minor].[maintenance]`` versioning scheme.
 .. toctree::
     :maxdepth: 1
 
+    v0.15.2
     v0.15.1
     v0.15.0
     v0.14.1

docs/releases/v0.15.2.rst

@@ -0,0 +1,8 @@
+CodeRed CMS 0.15.2 release notes
+================================
+
+
+Bug fixes
+---------
+
+* Fix 500 error on 404 pages and search page introduced in 0.15.1