From 435b6d30f94c8a1052a8dffed6feb09b8e6fad97 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 30 May 2014 22:12:35 +1000
Subject: [PATCH] Me again

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

diff --git a/modules/cms/classes/CmsObjectQuery.php b/modules/cms/classes/CmsObjectQuery.php
index 0d236061e..529f6ee28 100644
--- a/modules/cms/classes/CmsObjectQuery.php
+++ b/modules/cms/classes/CmsObjectQuery.php
@@ -69,6 +69,9 @@ class CmsObjectQuery
      */
     public function find($fileName)
     {
+        if (!$this->theme)
+            $this->inEditTheme();
+
         if ($this->useCache)
             return forward_static_call([$this->cmsObject, 'loadCached'], $this->theme, $fileName);
         else