From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 31 Jul 2009 06:54:01 +0000 (-0600)
Subject: Use prune() instead of setPruneFlag()
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=65844dfe572825d5c03e1eb7c78275490675eb95;p=horde.git

Use prune() instead of setPruneFlag()
---

diff --git a/imp/pgp.php b/imp/pgp.php
index 2e434be36..1c19a81dd 100644
--- a/imp/pgp.php
+++ b/imp/pgp.php
@@ -63,10 +63,11 @@ function _textWindowOutput($filename, $msg)
 
 function _reloadWindow()
 {
-    $cacheSess = Horde_SessionObjects::singleton();
     $reload = Horde_Util::getFormData('reload');
-    $cacheSess->setPruneFlag($reload, true);
-    Horde_Util::closeWindowJS('opener.focus();opener.location.href="' . $cacheSess->query($reload) . '";');
+    $cacheSess = Horde_SessionObjects::singleton();
+    $href = $cacheSess->query($reload);
+    $cacheSess->prune($reload);
+    Horde_Util::closeWindowJS('opener.focus();opener.location.href="' . $href . '";');
 }
 
 require_once dirname(__FILE__) . '/lib/base.php';
diff --git a/imp/smime.php b/imp/smime.php
index d767c258b..c1d8026f6 100644
--- a/imp/smime.php
+++ b/imp/smime.php
@@ -48,16 +48,18 @@ function _actionWindow()
 {
     $oid = Horde_Util::getFormData('passphrase_action');
     $cacheSess = Horde_SessionObjects::singleton();
-    $cacheSess->setPruneFlag($oid, true);
-    Horde_Util::closeWindowJS($cacheSess->query($oid));
+    $code = $cacheSess->query($oid);
+    $cacheSess->prune($oid);
+    Horde_Util::closeWindowJS($code);
 }
 
 function _reloadWindow()
 {
-    $cacheSess = Horde_SessionObjects::singleton();
     $reload = Horde_Util::getFormData('reload');
-    $cacheSess->setPruneFlag($reload, true);
-    Horde_Util::closeWindowJS('opener.focus();opener.location.href="' . $cacheSess->query($reload) . '";');
+    $cacheSess = Horde_SessionObjects::singleton();
+    $href = $cacheSess->query($reload);
+    $cacheSess->prune($reload);
+    Horde_Util::closeWindowJS('opener.focus();opener.location.href="' . $href . '";');
 }
 
 function _textWindowOutput($filename, $msg, $html = false)