From 2bf00847963e37432aa65c46fb6fe2c0cfcc8437 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sun, 18 Jan 2015 15:59:44 +1100
Subject: [PATCH] * Build 180 - Use less situational event names. @ping
 alekseybobkov

---
 modules/cms/classes/Controller.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 501387fa0..d5f032aff 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -301,21 +301,24 @@ class Controller extends BaseController
         }
 
         /*
-         * Render the page
+         * Extensibility
          */
-        Event::fire('cms.page.beforeTwigRender', [$page, $this->loader, $this->twig], true);
-
-        $apiResult = Event::fire('cms.page.getRenderedContents', [$this->page], true);
-        if (!strlen($apiResult)) {
+        if (
+            ($event = $this->fireEvent('page.beforeRenderPage', [$page], true)) ||
+            ($event = Event::fire('cms.page.beforeRenderPage', [$this, $page], true))
+        ) {
+            $this->pageContents = $event;
+        }
+        else {
+            /*
+             * Render the page
+             */
             CmsException::mask($this->page, 400);
             $this->loader->setObject($this->page);
             $template = $this->twig->loadTemplate($this->page->getFullPath());
             $this->pageContents = $template->render($this->vars);
             CmsException::unmask();
         }
-        else {
-            $this->pageContents = $apiResult;
-        }
 
         /*
          * Render the layout
@@ -934,6 +937,15 @@ class Controller extends BaseController
         return $this->twig;
     }
 
+    /**
+     * Returns the Twig loader.
+     * @return Cms\Twig\Loader
+     */
+    public function getLoader()
+    {
+        return $this->loader;
+    }
+
     /**
      * Returns the routing object.
      * @return \Cms\Classes\Router