From ff4585327e5f415d079970da7c5fcf605dd2581a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Sun, 25 Sep 2016 02:00:50 +0200
Subject: [PATCH 1/2] FEATURE: add helper function asset_path()

---
 app/Helpers/functions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Helpers/functions.php b/app/Helpers/functions.php
index 938ae77e..8a163000 100644
--- a/app/Helpers/functions.php
+++ b/app/Helpers/functions.php
@@ -23,4 +23,8 @@ function e($value)
  */
 function setting($key, $default = null) {
     return \App\Helpers\Settings::get($key, $default);
+}
+
+function asset_path($path) {
+    return env('SITE_URL').'/assets/'.$path;
 }
\ No newline at end of file

From a188c707d85afc450cf1dda3c792d0ea6d7b6151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Sun, 25 Sep 2016 02:01:24 +0200
Subject: [PATCH 2/2] FEATURE: ignore errors on pages during rendering, display
 error message for logged user

---
 templates/Base/OnePage/Handlers/OnePage.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/templates/Base/OnePage/Handlers/OnePage.php b/templates/Base/OnePage/Handlers/OnePage.php
index 1a0e1264..6ecaef48 100644
--- a/templates/Base/OnePage/Handlers/OnePage.php
+++ b/templates/Base/OnePage/Handlers/OnePage.php
@@ -4,6 +4,7 @@ namespace Templates\Base\OnePage\Handlers;
 use App\Handlers\Contracts\TemplateHandler;
 use App\Helpers\PageRenderer;
 use App\Helpers\Settings;
+use App\Helpers\Template;
 use App\Models\ActionLogType;
 use App\Models\Content;
 use App\Models\Module;
@@ -76,8 +77,14 @@ abstract class OnePage implements TemplateHandler
                 $pagesRaw[$page->url] = $page;
 
                 // save rendered pages
-                $pagesInTemplates[$page->url] = PageRenderer::render($page)
-                                                            ->render();
+                try {
+                    $pagesInTemplates[$page->url] = PageRenderer::render($page)
+                                                                ->render();
+                } catch (\Exception $e) {
+                    if (Auth::user()) {
+                        $pagesInTemplates[$page->url] = view(Template::name('errors.cannotRender'), ['page' => $page])->render();
+                    }
+                }
             }
 
             // return pages into template