diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php b/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php index 96e6632449..db42b01c84 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php @@ -11,6 +11,8 @@ namespace Alchemy\Phrasea\Media\Subdef; +use MediaAlchemyst\Specification\SpecificationInterface; + interface Subdef { const TYPE_IMAGE = 'image'; @@ -19,9 +21,20 @@ interface Subdef const TYPE_AUDIO = 'audio'; const TYPE_FLEXPAPER = 'flexpaper'; + /** + * One of Subdef Type const + * + * @return string + */ public function getType(); + /** + * @return string + */ public function getDescription(); + /** + * @return SpecificationInterface + */ public function getMediaAlchemystSpec(); } diff --git a/lib/classes/databox/subdef.php b/lib/classes/databox/subdef.php index 6960be686b..653ac83a1e 100644 --- a/lib/classes/databox/subdef.php +++ b/lib/classes/databox/subdef.php @@ -16,6 +16,7 @@ use Alchemy\Phrasea\Media\Subdef\FlexPaper; use Alchemy\Phrasea\Media\Subdef\Gif; use Alchemy\Phrasea\Media\Subdef\Subdef as SubdefSpecs; use Alchemy\Phrasea\Media\Type\Type as SubdefType; +use MediaAlchemyst\Specification\SpecificationInterface; use Symfony\Component\Translation\TranslatorInterface; class databox_subdef @@ -268,7 +269,7 @@ class databox_subdef /** * Get the MediaAlchemyst specs for the current subdef * - * @return type + * @return SpecificationInterface */ public function getSpecs() { diff --git a/lib/classes/recordutils/image.php b/lib/classes/recordutils/image.php index ac2dfbe14c..1c0fa411e9 100644 --- a/lib/classes/recordutils/image.php +++ b/lib/classes/recordutils/image.php @@ -395,7 +395,7 @@ class recordutils_image return false; } - $pathIn = $subdef->get_path() . $subdef->get_file(); + $pathIn = $subdef->getRealPath(); if (!is_file($pathIn)) { return false;