merge from cvs, make sure we append the session id if needed.

diff --git a/ansel/templates/image/edit_image.inc b/ansel/templates/image/edit_image.inc
index 4690ef9..2cabfe6 100644 (file)
--- a/ansel/templates/image/edit_image.inc
+++ b/ansel/templates/image/edit_image.inc
@@ -9,18 +9,18 @@ echo Horde::link($galleryurl) . Horde::img('galleries.png') . ' ' . _("Back to g
 echo Horde::link($imageview_url) . Horde::img('galleries.png') . ' ' . _("Cancel") . '</a> ';
 
 if (Ansel::isAvailable('rotate')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate270')) . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . '</a> ';
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate180')) . Horde::img('image/rotate-180.png') . ' ' . _("Rotate 180") . '</a> ';
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate90')) . Horde::img('image/rotate-90.png') . ' ' . _("Rotate Right") . '</a> ';
+    echo Horde::link(Horde::applicationUrl(Util::addParameter($imageurl, 'actionID', 'previewrotate270'))) . Horde::img('image/rotate-270.png', '', '', $registry->getImageDir('horde')) . ' ' . _("Rotate Left") . '</a> ';
+    echo Horde::link(Horde::applicationUrl(Util::addParameter($imageurl, 'actionID', 'previewrotate180'))) . Horde::img('image/rotate-180.png', '', '', $registry->getImageDir('horde')) . ' ' . _("Rotate 180") . '</a> ';
+    echo Horde::link(Horde::applicationUrl(Util::addParameter($imageurl, 'actionID', 'previewrotate90'))) . Horde::img('image/rotate-90.png', '', '', $registry->getImageDir('horde')) . ' ' . _("Rotate Right") . '</a> ';
 }
 if (Ansel::isAvailable('flip')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewflip')) . Horde::img('image/flip.png') . ' ' . _("Flip") . '</a> ';
+    echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($imageurl, 'actionID', 'previewflip'))) . Horde::img('image/flip.png') . ' ' . _("Flip") . '</a> ';
 }
 if (Ansel::isAvailable('mirror')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewmirror')) . Horde::img('image/mirror.png') . ' ' . _("Mirror") . '</a> ';
+    echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($imageurl, 'actionID', 'previewmirror'))) . Horde::img('image/mirror.png') . ' ' . _("Mirror") . '</a> ';
 }
 if (Ansel::isAvailable('grayscale')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewgrayscale')) . Horde::img('image/grayscale.png') . ' ' . _("Grayscale") . '</a> ';
+    echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($imageurl, 'actionID', 'previewgrayscale'))) . Horde::img('image/grayscale.png') . ' ' . _("Grayscale") . '</a> ';
 }
 if (Ansel::isAvailable('TextWatermark')) {
     echo Horde::link('#', '', '', '_blank', Horde::popupJs(Horde::applicationUrl($imageurl), array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;') . Horde::img('text.png') . ' ' . _("Watermark") . '</a> ';