Fix removing source from image TV value (#508)

modxcms · Aug 19, 2024 · 79a6ec0 · 79a6ec0
1 parent 6723a07
commit 79a6ec0
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/components/fred/src/Traits/RenderResource.php b/core/components/fred/src/Traits/RenderResource.php
@@ -426,13 +426,20 @@ public function reversePreparedOutput($tv, $value, $resource)
         if (!empty($value)) {
             $context = !empty($resource) ? $resource->get('context_key') : $this->modx->context->get('key');
             $sourceCache = $tv->getSourceCache($context);
-            $classKey = $sourceCache['class_key'];
+            $classKey = $sourceCache['source_class_key'];
             if (!empty($sourceCache) && !empty($classKey)) {
                 if ($this->modx->loadClass($classKey)) {
                     $source = $this->modx->newObject($classKey);
                     if ($source) {
                         $source->fromArray($sourceCache, '', true, true);
                         $source->initialize();
+                        $bases = $source->getBases();
+                        if (!empty($bases['urlAbsolute'])) {
+                            $url = $bases['urlAbsolute'];
+                            if (substr($value, 0, strlen($url)) === $url) {
+                                return substr($value, strlen($url));
+                            }
+                        }
                         $properties = $source->getPropertyList();
                         if (!empty($properties['baseUrl'])) {
                             // remove the base url from the front of the value