From cc6b44223ec2e606ccc2fc19b60679c5e9862884 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Fri, 21 Jul 2017 09:56:41 +1200
Subject: [PATCH 1/2] BUGFIX: ContentController still using global $project;

---
 code/Controllers/ContentController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php
index d55ecbd7..7ec6b2b2 100644
--- a/code/Controllers/ContentController.php
+++ b/code/Controllers/ContentController.php
@@ -10,6 +10,7 @@ use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Convert;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Core\Manifest\ModuleManifest;
 use SilverStripe\i18n\i18n;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
@@ -247,8 +248,7 @@ class ContentController extends Controller
      */
     public function project()
     {
-        global $project;
-        return $project;
+        return ModuleManifest::config()->get('project');    
     }
 
     /**

From fbb63e68e1780e69d033dc8a5dacf257169828e1 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Fri, 21 Jul 2017 10:10:53 +1200
Subject: [PATCH 2/2] Remove whitespace

---
 code/Controllers/ContentController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php
index 7ec6b2b2..7467a71d 100644
--- a/code/Controllers/ContentController.php
+++ b/code/Controllers/ContentController.php
@@ -248,7 +248,7 @@ class ContentController extends Controller
      */
     public function project()
     {
-        return ModuleManifest::config()->get('project');    
+        return ModuleManifest::config()->get('project');
     }
 
     /**