From: <an...@us...> - 2008-08-27 05:55:30
|
Revision: 17934 http://gallery.svn.sourceforge.net/gallery/?rev=17934&view=rev Author: andy_st Date: 2008-08-27 05:55:40 +0000 (Wed, 27 Aug 2008) Log Message: ----------- Don't HTML escape the returnUrl which is sent to snapgalaxy. Modified Paths: -------------- trunk/gallery2/modules/snapgalaxy/SnapGalaxyPrintPhotos.inc trunk/gallery2/modules/snapgalaxy/classes/SnapGalaxyCartPlugin.class Modified: trunk/gallery2/modules/snapgalaxy/SnapGalaxyPrintPhotos.inc =================================================================== --- trunk/gallery2/modules/snapgalaxy/SnapGalaxyPrintPhotos.inc 2008-08-26 16:25:16 UTC (rev 17933) +++ trunk/gallery2/modules/snapgalaxy/SnapGalaxyPrintPhotos.inc 2008-08-27 05:55:40 UTC (rev 17934) @@ -45,6 +45,8 @@ return array($ret, null); } + $returnUrl = GalleryUtilities::htmlEntityDecode($returnUrl); + GalleryCoreApi::requireOnce('modules/snapgalaxy/classes/SnapGalaxyHelper.class'); list ($ret, $cartUrl) = SnapGalaxyHelper::printPhotos(array($item->getId() => 1), $returnUrl); Modified: trunk/gallery2/modules/snapgalaxy/classes/SnapGalaxyCartPlugin.class =================================================================== --- trunk/gallery2/modules/snapgalaxy/classes/SnapGalaxyCartPlugin.class 2008-08-26 16:25:16 UTC (rev 17933) +++ trunk/gallery2/modules/snapgalaxy/classes/SnapGalaxyCartPlugin.class 2008-08-27 05:55:40 UTC (rev 17934) @@ -59,7 +59,8 @@ $urlGenerator =& $gallery->getUrlGenerator(); $returnUrl = $urlGenerator->generateUrl( - array('view' => 'cart.ViewCart'), array('forceFullUrl' => true)); + array('view' => 'cart.ViewCart'), + array('forceFullUrl' => true, 'htmlEntities' => false)); GalleryCoreApi::requireOnce('modules/snapgalaxy/classes/SnapGalaxyHelper.class'); list ($ret, $cartUrl) = SnapGalaxyHelper::printPhotos($cartItemIds, $returnUrl); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |