fixing django cms handle no page - redirect to fallback urls

cms/page_rendering.py

@@ -55,12 +55,10 @@ def render_page(request, page, current_language, slug):
 def _handle_no_page(request):
     try:
         # add a $ to the end of the url (does not match on the cms anymore)
-        resolve('%s$' % request.path)
+        return resolve('%s$' % request.path).func(request)
     except Resolver404 as e:
         # raise a django http 404 page
-        exc = Http404(dict(path=request.path, tried=e.args[0]['tried']))
-        raise exc
-    raise Http404('CMS Page not found: %s' % request.path)
+        raise Http404(dict(path=request.path, tried=e.args[0]['tried']))
 
 
 def _handle_no_apphook(request):

cms/views.py

@@ -116,7 +116,7 @@ def details(request, slug):
 
     if not page:
         # raise 404
-        _handle_no_page(request)
+        return _handle_no_page(request)
 
     request.current_page = page