Merge branch '4.3' into 4

This commit is contained in:
Aaron Carlino 2019-01-10 12:31:27 +13:00
commit ab5bbda88c

View File

@ -279,6 +279,10 @@ trait CustomMethods
$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) {