tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Update Object.php

Browse Source 
Check to ensure `self::$extra_methods[$this->class][$method]` exists before trying to retrieve it. Prevents a bunch of notices from being generated.
This commit is contained in:
Joe Chenevey 2019-01-08 15:02:22 -05:00 committed by GitHub
parent 214c6ddb8e
commit 02e31932f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Object.php
View File

@ -908,12 +908,14 @@ abstract class SS_Object {
$methods = $this->findMethodsFromExtension($extension); $methods = $this->findMethodsFromExtension($extension);
if ($methods) { if ($methods) {
foreach ($methods as $method) { foreach ($methods as $method) {
if (isset(self::$extra_methods[$this->class][$method])) {
$methodInfo = self::$extra_methods[$this->class][$method]; $methodInfo = self::$extra_methods[$this->class][$method];
if ($methodInfo['property'] === $property && $methodInfo['index'] === $index) { if ($methodInfo['property'] === $property && $methodInfo['index'] === $index) {
unset(self::$extra_methods[$this->class][$method]); unset(self::$extra_methods[$this->class][$method]);
} }
} }
}
if (empty(self::$extra_methods[$this->class])) { if (empty(self::$extra_methods[$this->class])) {
unset(self::$extra_methods[$this->class]); unset(self::$extra_methods[$this->class]);