From cb76d7e6a1a08c9400d5b0435a226a07c1557cc8 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 28 Oct 2024 13:18:47 +0100 Subject: [PATCH] wait #7158 @0.5 --- src/Compiler/CompilerInterface.php | 2 +- src/Links/IFrameLink.php | 9 ++++++++- src/Links/Link.php | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Compiler/CompilerInterface.php b/src/Compiler/CompilerInterface.php index 6f13d20..ae1d847 100644 --- a/src/Compiler/CompilerInterface.php +++ b/src/Compiler/CompilerInterface.php @@ -14,7 +14,7 @@ interface CompilerInterface public function addBookmarkGroup($link); - public function getConfigZIP($d); + public function getConfigZIP($d, $file = null, $uid = null, $page = null); public function getSetting($key, $default = null); diff --git a/src/Links/IFrameLink.php b/src/Links/IFrameLink.php index 64e1ca0..036ad58 100644 --- a/src/Links/IFrameLink.php +++ b/src/Links/IFrameLink.php @@ -17,7 +17,11 @@ class IFrameLink extends Link function getHTMLContent() { - return ''; + $f = self::_handleFile($this); + if (null === $f) { + return ''; + } + return ''; } /** @@ -39,6 +43,9 @@ class IFrameLink extends Link $config = $link->getConfigZip($d['dir']); $link->copyExternalDir($d['dir'], $d['fdir']); } + if (null === $config) { + return null; + } if ($config['html']) { return $d['fdir'] . '/' . $config['html']; } diff --git a/src/Links/Link.php b/src/Links/Link.php index 620a986..5504939 100644 --- a/src/Links/Link.php +++ b/src/Links/Link.php @@ -857,7 +857,7 @@ class Link public function getConfigZIP($d) { - return $this->compiler->getConfigZIP($d); + return $this->compiler->getConfigZIP($d, $this->to, $this->uid, $this->page); } public function getConfigHTML($d, $html) -- 2.39.5