From 08c0d78296d4518a5ece4d6a2c05b9be83580aa8 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Tue, 18 Jul 2017 13:56:09 +0200 Subject: issue #827 provide backward compatibility for album links generated in earlier times before the ambiguity of photo album names was solved. This may provide incorrect results if two or more photo albums with the same basename exist in different directories of the file tree; but there is no easy way to solve that ambiguity - which is why the link format changed. --- include/photos.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/photos.php') diff --git a/include/photos.php b/include/photos.php index 6ea444e2e..f5d5fdb48 100644 --- a/include/photos.php +++ b/include/photos.php @@ -593,6 +593,15 @@ function photos_album_exists($channel_id, $observer_hash, $album) { intval($channel_id) ); + // partial backward compatibility with Hubzilla < 2.4 when we used the filename only + // (ambiguous which would get chosen if you had two albums of the same name in different directories) + if(!$r) { + $r = q("SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE filename = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1", + dbesc(hex2bin($album)), + intval($channel_id) + ); + } + return (($r) ? $r[0] : false); } -- cgit v1.2.3