From 6cfdd7fce84cfd3101a53fdc6735ee0ec5bb57c5 Mon Sep 17 00:00:00 2001 From: nbm Date: Mon, 12 Dec 2005 19:52:32 +0000 Subject: [PATCH] Rename a few remaining oModifiedDocument to oMovedDocument in the move subscription. --- lib/subscriptions/subscriptions.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/subscriptions/subscriptions.inc.php b/lib/subscriptions/subscriptions.inc.php index 8645071..38560f7 100644 --- a/lib/subscriptions/subscriptions.inc.php +++ b/lib/subscriptions/subscriptions.inc.php @@ -399,7 +399,7 @@ class SubscriptionEvent { function MoveDocument($oMovedDocument, $oToFolder, $oFromFolder) { $content = new SubscriptionContent(); // needed for i18n // OK: two actions: document registrants, folder registrants. - $aUsers = $this->_getSubscribers($oModifiedDocument->getId(), $this->subscriptionTypes["Document"]); + $aUsers = $this->_getSubscribers($oMovedDocument->getId(), $this->subscriptionTypes["Document"]); $aUsers = $this->_pruneAlertedUsers($aUsers); // setup the alerted users. _might_ be a singleton. foreach ($aUsers as $oSubscriber) { @@ -407,7 +407,7 @@ class SubscriptionEvent { $aNotificationOptions = array(); $aNotificationOptions['target_user'] = $oSubscriber->getID(); $aNotificationOptions['actor_id'] = KTUtil::arrayGet($_SESSION,"userID", null); // _won't_ be null. - $aNotificationOptions['target_name'] = $oModifiedDocument->getName(); + $aNotificationOptions['target_name'] = $oMovedDocument->getName(); $aNotificationOptions['location_name'] = $oToFolder->getName(); $aNotificationOptions['object_id'] = $oToFolder->getId(); // parent folder_id, in this case. $aNotificationOptions['event_type'] = "MovedDocument"; @@ -432,7 +432,7 @@ class SubscriptionEvent { $aNotificationOptions = array(); $aNotificationOptions['target_user'] = $oSubscriber->getID(); $aNotificationOptions['actor_id'] = KTUtil::arrayGet($_SESSION,"userID", null); // _won't_ be null. - $aNotificationOptions['target_name'] = $oModifiedDocument->getName(); + $aNotificationOptions['target_name'] = $oMovedDocument->getName(); $aNotificationOptions['location_name'] = $oToFolder->getName(); $aNotificationOptions['object_id'] = $oToFolder->getId(); // parent folder_id, in this case. $aNotificationOptions['event_type'] = "MovedDocument"; @@ -456,7 +456,7 @@ class SubscriptionEvent { $aNotificationOptions = array(); $aNotificationOptions['target_user'] = $oSubscriber->getID(); $aNotificationOptions['actor_id'] = KTUtil::arrayGet($_SESSION,"userID", null); // _won't_ be null. - $aNotificationOptions['target_name'] = $oModifiedDocument->getName(); + $aNotificationOptions['target_name'] = $oMovedDocument->getName(); $aNotificationOptions['location_name'] = $oToFolder->getName(); $aNotificationOptions['object_id'] = $oToFolder->getId(); // parent folder_id, in this case. $aNotificationOptions['event_type'] = "MovedDocument"; @@ -753,4 +753,4 @@ class SubscriptionContent { } } -?> \ No newline at end of file +?> -- libgit2 0.21.4