Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 16:24:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle WebDAV derivative identity correctly

Browse Source
This commit is contained in:
Terranom674
2026-08-18 23:09:53 +02:00
parent bcf98c63ef
commit b3aef2744f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/webdav_image_runtime.inc.php
View File

@@ -189,6 +189,11 @@ function bratonien_tools_webdav_generate_derivative($params, $src_image)
if (!class_exists('pwg_image')) require_once(PHPWG_ROOT_PATH.'admin/include/image.class.php'); if (!class_exists('pwg_image')) require_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
$derivative = new DerivativeImage($params, $src_image); $derivative = new DerivativeImage($params, $src_image);
if ($derivative->same_as_source())
{
return true;
}
$target = $derivative->get_path(); $target = $derivative->get_path();
if ($target === '' || strpos($target, PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR) !== 0) return false; if ($target === '' || strpos($target, PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR) !== 0) return false;
@@ -249,8 +254,6 @@ function bratonien_tools_filter_webdav_derivative_url($url, $params, $src_image,
{ {
if (bratonien_tools_webdav_generate_derivative($params, $src_image)) if (bratonien_tools_webdav_generate_derivative($params, $src_image))
{ {
// Keep Piwigo's normal derivative URL. The file behind it now contains
// the derivative generated from the prepared WebDAV preview.
return $url; return $url;
} }
} }
@@ -259,8 +262,6 @@ function bratonien_tools_filter_webdav_derivative_url($url, $params, $src_image,
error_log('Bratonien WebDAV derivative #'.(int)$src_image->id.': '.$e->getMessage()); error_log('Bratonien WebDAV derivative #'.(int)$src_image->id.': '.$e->getMessage());
} }
// Last-resort display fallback: show the prepared preview/original stream
// instead of allowing Piwigo to derive from the 1x1 placeholder.
$webdav_url = bratonien_tools_webdav_image_url((int)$src_image->id, true); $webdav_url = bratonien_tools_webdav_image_url((int)$src_image->id, true);
return $webdav_url ?: $url; return $webdav_url ?: $url;
} }