Merge pull request #5 from lekoala/master

dev/build fixes
markguinn · Sep 18, 2015 · 037c48d · 037c48d
2 parents afbab84 + 3b17c6b
commit 037c48d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/ClockworkControllerExtension.php b/src/ClockworkControllerExtension.php
@@ -17,7 +17,7 @@
 class ClockworkControllerExtension extends Extension
 {
     public function onBeforeInit() {
-        if (Director::isDev()) {
+        if (Director::isDev() && class_exists('Clockwork\\Request\\ClockworkTimeline')) {
             Injector::inst()->get('ClockworkTimeline')->startEvent(
                 get_class($this->owner) . '_init',
                 get_class($this->owner) . ' initialization'
@@ -26,7 +26,7 @@ public function onBeforeInit() {
     }
 
     public function onAfterInit() {
-        if (Director::isDev()) {
+        if (Director::isDev() && class_exists('Clockwork\\Request\\ClockworkTimeline')) {
             $injector = Injector::inst();
             $injector->get('ClockworkTimeline')->endEvent(get_class($this->owner) . '_init');
             $injector->get('ClockworkTimeline')->startEvent(

diff --git a/src/RequestFilter.php b/src/RequestFilter.php
@@ -33,7 +33,8 @@ class RequestFilter implements \RequestFilter
      * @return boolean Whether to continue processing other filters. Null or true will continue processing (optional)
      */
     public function preRequest(SS_HTTPRequest $request, Session $session, DataModel $model) {
-        if (Director::isDev()) {
+        if (Director::isDev() && class_exists('Clockwork\\Clockwork')) {
+
             $this->clockwork = new Clockwork();
 
             // Wrap the current database adapter in a proxy object so we can log queries
@@ -59,7 +60,7 @@ public function preRequest(SS_HTTPRequest $request, Session $session, DataModel
      * @return boolean Whether to continue processing other filters. Null or true will continue processing (optional)
      */
     public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) {
-        if (Director::isDev()) {
+        if (isset($this->clockwork)) {
             $response->addHeader("X-Clockwork-Id", $this->clockwork->getRequest()->id);
             $response->addHeader("X-Clockwork-Version", Clockwork::VERSION);
             $response->addHeader('X-Clockwork-Path', Director::baseURL() . '__clockwork/');