From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sun, 9 May 2010 19:33:21 +0000 (-0400)
Subject: merge from cvs:
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d653cbb76fcb36a689b2df0659349894cb3b9f4d;p=horde.git

merge from cvs:

[mjr] Do not remove history entries when removing user data (Bug: 8755).
---

diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
index 940f837e2..960f7826e 100644
--- a/kronolith/docs/CHANGES
+++ b/kronolith/docs/CHANGES
@@ -32,7 +32,7 @@ v3.0-git
 v2.3.5-cvs
 ----------
 
-
+[mjr] Do not remove history entries when removing user data (Bug: 8755).
 
 
 ------
diff --git a/kronolith/lib/Application.php b/kronolith/lib/Application.php
index 5b4be45b6..2eec8bca0 100644
--- a/kronolith/lib/Application.php
+++ b/kronolith/lib/Application.php
@@ -437,9 +437,6 @@ class Kronolith_Application extends Horde_Registry_Application
         /* Remove all events owned by the user in all calendars. */
         $result = Kronolith::getDriver()->removeUserData($user);
 
-        /* Now delete history as well. */
-        $GLOBALS['injector']->getInstance('Horde_History')->removeByParent('kronolith:' . $user);
-
         /* Get the user's default share */
         try {
             $share = $GLOBALS['kronolith_shares']->getShare($user);
diff --git a/mnemo/docs/CHANGES b/mnemo/docs/CHANGES
index 4b2035dfc..ff3a25beb 100644
--- a/mnemo/docs/CHANGES
+++ b/mnemo/docs/CHANGES
@@ -10,7 +10,7 @@ v3.0-cvs
 v2.2.4-cvs
 ----------
 
-
+[mjr] Do not remove history entries when removing user data (Bug: 8755).
 
 ------
 v2.2.3
diff --git a/mnemo/lib/Api.php b/mnemo/lib/Api.php
index 9b9eaccbc..0b5d2a25b 100644
--- a/mnemo/lib/Api.php
+++ b/mnemo/lib/Api.php
@@ -126,23 +126,6 @@ function _mnemo_removeUserData($user)
             }
         }
 
-        /* Now delete history as well. */
-        $history = $GLOBALS['injector']->getInstance('Horde_History');
-        if (method_exists($history, 'removeByParent')) {
-            $histories = $history->removeByParent('mnemo:' . $user);
-        } else {
-            /* Remove entries 100 at a time. */
-            $all = $history->getByTimestamp('>', 0, array(), 'mnemo:' . $user);
-            if (is_a($all, 'PEAR_Error')) {
-                Horde::logMessage($all, 'ERR');
-            } else {
-                $all = array_keys($all);
-                while (count($d = array_splice($all, 0, 100)) > 0) {
-                    $history->removebyNames($d);
-                }
-            }
-        }
-
         /* Remove the share itself */
         if (!empty($share)) {
             $result = $GLOBALS['mnemo_shares']->removeShare($share);
diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
index 5a065336c..aa96666d7 100644
--- a/nag/docs/CHANGES
+++ b/nag/docs/CHANGES
@@ -15,7 +15,7 @@ v3.0-git
 v2.3.6-cvs
 ----------
 
-
+[mjr] Do not remove history entries when removing user data (Bug: 8755).
 
 
 ------
diff --git a/nag/lib/Application.php b/nag/lib/Application.php
index 36f154b98..0205bfbb1 100644
--- a/nag/lib/Application.php
+++ b/nag/lib/Application.php
@@ -266,9 +266,6 @@ class Nag_Application extends Horde_Registry_Application
             }
         }
 
-        /* Now delete history as well. */
-        $GLOBALS['injector']->getInstance('Horde_History')->removeByParent('nag:' . $user);
-
         /* ...and finally, delete the actual share */
         if (!empty($share)) {
             $result = $GLOBALS['nag_shares']->removeShare($share);