[gallery2] CAPTCHA fixes.

[Jon Ciesla]

commit 99a44305a463a0e1d16ab2b4f70385c82c126aae
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Nov 27 08:00:17 2012 -0600

    CAPTCHA fixes.

 gallery2-2.3-captcha.patch |   15 +++++++++++++--
 gallery2.spec              |    5 ++++-
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/gallery2-2.3-captcha.patch b/gallery2-2.3-captcha.patch
index c2d2c71..cfaab00 100644
--- a/gallery2-2.3-captcha.patch
+++ b/gallery2-2.3-captcha.patch
@@ -1,6 +1,17 @@
 --- modules/core/classes/GallerySession.class~	2009-05-21 09:03:54.000000000 -0500
 +++ modules/core/classes/GallerySession.class	2009-05-21 09:03:54.000000000 -0500
 @@ -27,0 +28,3 @@
-+//BZ 501871, captcha fix.
-+GalleryCoreApi::requireOnce('modules/core/classes/GalleryTranslator.class');  
++//BZ 878320, captcha fix.
++require_once(dirname(__FILE__) . '/' . 'GalleryTranslator.class');
 +
+--- modules/captcha/CaptchaImage.inc~	2008-04-12 19:38:13.000000000 -0500
++++ modules/captcha/CaptchaImage.inc	2012-11-27 07:57:22.606358425 -0600
+@@ -88,7 +88,7 @@
+ 
+ 	/* Output the image and reclaim the memory it used */
+ 	/* Use low quality jpeg compression to make the image less OCR-able */
+-	ImageJPEG($image, '', 50);
++	ImageJPEG($image, NULL, 50);
+ 	ImageDestroy($image);
+ 
+ 	return null;
diff --git a/gallery2.spec b/gallery2.spec
index d9cae1a..d5e3b79 100644
--- a/gallery2.spec
+++ b/gallery2.spec
@@ -7,7 +7,7 @@ URL: http://gallery.menalto.com
 Name: gallery2
 Version: 2.3.2
 Group: Applications/Publishing
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -1123,6 +1123,9 @@ fi
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Tue Nov 27 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.2-5
+- CAPTCHA fixes, BZ 878320, BZ 880006.
+
 * Wed Oct 10 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.2-4
 - Fix for huge log files, BZ 863429.