slp
/
po
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[watermark] Ensure we always use the original watermark image.

This commit is contained in:
Solomon Peachy 2008-09-27 10:10:07 -04:00
parent 11553f0517
commit 29d5b2bed6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -21,6 +21,7 @@ For further information about Photo Organizer, see its web site at:
[misc] When editing a folder/album, return to where you came. [#380]
[fix] 'replace master' on version uploads was broken. [#383]
[fix] Installer suggested an improper cmdline [#384]
[fix] We weren't using the original watermark image sometimes. [#388]
2.36 (August 17, 2008)

2
src/photo.move.php
View File

@ -228,7 +228,7 @@ if ($move_f_request && ($destination_folder != "")) {
}
} elseif ($watermark_request) {
$row = pg_fetch_row(pg_query($database, "select path from files where version=$version_id"));
$row = pg_fetch_row(pg_query($database, "select path from files where version=$version_id and size = 0"));
store_user_pref($database, $po_user['id'], 'watermark_photo', $version_id);
store_user_pref($database, $po_user['id'], 'watermark_path', $row[0]);
} elseif ($transform_request && ($transform != "")) {