From 67a4c281582e40cb78efe891d9280bd2b849474e Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Wed, 25 Jan 2017 15:29:42 +1300
Subject: [PATCH] FIX Add actions to injector configuration

---
 _config/{injetor.yml => injector.yml}     | 15 +++++++++++++++
 src/Extensions/BetterButtonDataObject.php |  8 ++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 rename _config/{injetor.yml => injector.yml} (66%)

diff --git a/_config/injetor.yml b/_config/injector.yml
similarity index 66%
rename from _config/injetor.yml
rename to _config/injector.yml
index 7ea647f..0b7eb86 100644
--- a/_config/injetor.yml
+++ b/_config/injector.yml
@@ -28,3 +28,18 @@ SilverStripe\Core\Injector\Injector:
     class: UncleCheese\BetterButtons\Buttons\BetterButton_SaveDraft
   BetterButton_Unpublish:
     class: UncleCheese\BetterButtons\Buttons\BetterButton_Unpublish
+
+  BetterButtonAction:
+    class: UncleCheese\BetterButtons\Actions\BetterButton
+  BetterButtonCancelAction:
+    class: UncleCheese\BetterButtons\Actions\BetterButtonCancelAction
+  BetterButtonCustomAction:
+    class: UncleCheese\BetterButtons\Actions\BetterButtonCustomAction
+  BetterButtonFrontendLinksAction:
+    class: UncleCheese\BetterButtons\Actions\BetterButtonFrontendLinksAction
+  BetterButtonLink:
+    class: UncleCheese\BetterButtons\Actions\BetterButtonLink
+  BetterButtonNestedForm:
+    class: UncleCheese\BetterButtons\Actions\BetterButtonNestedForm
+  BetterButtonPrevNextAction:
+    class: UncleCheese\BetterButtons\Actions\BetterButtonPrevNextAction
diff --git a/src/Extensions/BetterButtonDataObject.php b/src/Extensions/BetterButtonDataObject.php
index 188b042..0c5de34 100755
--- a/src/Extensions/BetterButtonDataObject.php
+++ b/src/Extensions/BetterButtonDataObject.php
@@ -174,10 +174,10 @@ protected function createFieldList($buttons)
      */
     protected function instantiateButton($className)
     {
-        if (class_exists($className)) {
-            $buttonObj = Injector::inst()->create($className);
-            return $buttonObj;
-        } else {
+        try {
+            return Injector::inst()->create($className);
+        } catch (Exception $ex) {
+            // Customize the default injector exception
             throw new Exception("The button type $className doesn't exist.");
         }
     }