Check for Controller::curr();

It is nog a fact that there is always a Controller on the command line
silverleague · Apr 16, 2016 · 25acf80 · 25acf80
1 parent af2147f
commit 25acf80
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/code/Extensions/Annotatable.php b/code/Extensions/Annotatable.php
@@ -52,9 +52,13 @@ public function requireDefaultRecords()
         // Setup the protected values.
         $this->setUp();
 
-        /** @var SS_HTTPRequest|NullHTTPRequest $request */
-        $request = Controller::curr()->getRequest();
-        $skipAnnotation = $request->getVar('skipannotation');
+        $skipAnnotation = null;
+
+        // This is not the case on the command line
+        if(Controller::has_curr()) {
+            $skipAnnotation = Controller::curr()->getRequest()->getVar('skipannotation');
+        }
+
         if ($skipAnnotation !== null || !$this->permissionChecker->environmentIsAllowed()) {
             return false;
         }