Merge pull request #8703 from jchenevey/4.3

CustomMethods->removeMethodsFrom Warnings
silverstripe · Jan 8, 2019 · 544f9e1 · 544f9e1
2 parents 937d73f + 068c240
commit 544f9e1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/Core/CustomMethods.php b/src/Core/CustomMethods.php
@@ -279,6 +279,10 @@ protected function removeMethodsFrom($property, $index = null)
         $methods = $this->findMethodsFromExtension($extension);
         if ($methods) {
             foreach ($methods as $method) {
+                if (!isset(self::$extra_methods[$class][$method])) {
+                    continue;
+                }
+
                 $methodInfo = self::$extra_methods[$class][$method];
 
                 if ($methodInfo['property'] === $property && $methodInfo['index'] === $index) {