[ansel] Bug in new watermark code (lib/Gallery.php)

[Heath S. Hendrickson]

Can someone else verify that the new watermark code is working? I got 
this error when trying to view the preview image (the error was hidden, 
you had to right-click on the Image Preview text and select View Image 
to get it)

*Warning*: 
watermark(/var/www/secure/horde/ansel/lib/../../lib/Identity.php): 
failed to open stream: No such file or directory in 
*/var/www/secure/horde/ansel/lib/Gallery.php* on line *830*

*Fatal error*: watermark(): Failed opening required 
'/var/www/secure/horde/ansel/lib/../../lib/Identity.php' 
(include_path='.:/php/includes:/usr/share/php:/usr/share/pear:/var/www/secure/chat/includes') 
in */var/www/secure/horde/ansel/lib/Gallery.php* on line *830

*It looks like the code in Gallery wasn't updated with the new require 
now that Identity is in the Horde framework pear modules.

Here's a patch to fix it:

[root at space ansel]# cvs diff lib/Gallery.php
Index: lib/Gallery.php
===================================================================
RCS file: /usr/local/horde/cvs/ansel/lib/Gallery.php,v
retrieving revision 1.43
diff -r1.43 Gallery.php
830c830
<             require_once HORDE_BASE . '/lib/Identity.php';
---
 >             require_once HORDE_LIBS . 'Horde/Identity.php';


That fixes the preview image displaying, but I'm still not seeing the 
watermark on the image.

heath