Support for legacy plugins using October's ExtendableTrait (#171)

wintercms · Mar 6, 2024 · ca1796f · ca1796f
1 parent dd89dc1
commit ca1796f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Extension/ExtendableTrait.php b/src/Extension/ExtendableTrait.php
@@ -9,6 +9,7 @@
 use Winter\Storm\Support\Serialization;
 use Illuminate\Support\Facades\App;
 use ReflectionException;
+use October\Rain\Extension\ExtendableTrait as OctoberExtendableTrait;
 
 /**
  * This extension trait is used when access to the underlying base class
@@ -566,7 +567,10 @@ protected function extensionGetParentClass(object $instance = null)
             return false;
         }
 
-        while (!in_array(ExtendableTrait::class, $parent->getTraitNames())) {
+        while (
+            !in_array(ExtendableTrait::class, $parent->getTraitNames())
+            && !in_array(OctoberExtendableTrait::class, $parent->getTraitNames())
+        ) {
             $parent = $parent->getParentClass();
             if ($parent === false) {
                 break;