From 680887f4529b039ee19f33a157da91b56dbf8da5 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 25 Mar 2016 09:56:36 +1100
Subject: [PATCH] Fixes component access issue

---
 modules/cms/classes/CodeBase.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/cms/classes/CodeBase.php b/modules/cms/classes/CodeBase.php
index a3013cf4a..4fc9eb9bd 100644
--- a/modules/cms/classes/CodeBase.php
+++ b/modules/cms/classes/CodeBase.php
@@ -122,6 +122,10 @@ class CodeBase extends Extendable implements ArrayAccess
      */
     public function __get($name)
     {
+        if (isset($this->page->components[$name]) || isset($this->layout->components[$name])) {
+            return $this[$name];
+        }
+
         if (($value = $this->page->{$name}) !== null) {
             return $value;
         }