Commit 6cfdd7fce84cfd3101a53fdc6735ee0ec5bb57c5

Authored by nbm
1 parent 405b3adf

Rename a few remaining oModifiedDocument to oMovedDocument in the move

subscription.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4420 c91229c3-7414-0410-bfa2-8a42b809f60b
lib/subscriptions/subscriptions.inc.php
... ... @@ -399,7 +399,7 @@ class SubscriptionEvent {
399 399 function MoveDocument($oMovedDocument, $oToFolder, $oFromFolder) {
400 400 $content = new SubscriptionContent(); // needed for i18n
401 401 // OK: two actions: document registrants, folder registrants.
402   - $aUsers = $this->_getSubscribers($oModifiedDocument->getId(), $this->subscriptionTypes["Document"]);
  402 + $aUsers = $this->_getSubscribers($oMovedDocument->getId(), $this->subscriptionTypes["Document"]);
403 403 $aUsers = $this->_pruneAlertedUsers($aUsers); // setup the alerted users. _might_ be a singleton.
404 404 foreach ($aUsers as $oSubscriber) {
405 405  
... ... @@ -407,7 +407,7 @@ class SubscriptionEvent {
407 407 $aNotificationOptions = array();
408 408 $aNotificationOptions['target_user'] = $oSubscriber->getID();
409 409 $aNotificationOptions['actor_id'] = KTUtil::arrayGet($_SESSION,"userID", null); // _won't_ be null.
410   - $aNotificationOptions['target_name'] = $oModifiedDocument->getName();
  410 + $aNotificationOptions['target_name'] = $oMovedDocument->getName();
411 411 $aNotificationOptions['location_name'] = $oToFolder->getName();
412 412 $aNotificationOptions['object_id'] = $oToFolder->getId(); // parent folder_id, in this case.
413 413 $aNotificationOptions['event_type'] = "MovedDocument";
... ... @@ -432,7 +432,7 @@ class SubscriptionEvent {
432 432 $aNotificationOptions = array();
433 433 $aNotificationOptions['target_user'] = $oSubscriber->getID();
434 434 $aNotificationOptions['actor_id'] = KTUtil::arrayGet($_SESSION,"userID", null); // _won't_ be null.
435   - $aNotificationOptions['target_name'] = $oModifiedDocument->getName();
  435 + $aNotificationOptions['target_name'] = $oMovedDocument->getName();
436 436 $aNotificationOptions['location_name'] = $oToFolder->getName();
437 437 $aNotificationOptions['object_id'] = $oToFolder->getId(); // parent folder_id, in this case.
438 438 $aNotificationOptions['event_type'] = "MovedDocument";
... ... @@ -456,7 +456,7 @@ class SubscriptionEvent {
456 456 $aNotificationOptions = array();
457 457 $aNotificationOptions['target_user'] = $oSubscriber->getID();
458 458 $aNotificationOptions['actor_id'] = KTUtil::arrayGet($_SESSION,"userID", null); // _won't_ be null.
459   - $aNotificationOptions['target_name'] = $oModifiedDocument->getName();
  459 + $aNotificationOptions['target_name'] = $oMovedDocument->getName();
460 460 $aNotificationOptions['location_name'] = $oToFolder->getName();
461 461 $aNotificationOptions['object_id'] = $oToFolder->getId(); // parent folder_id, in this case.
462 462 $aNotificationOptions['event_type'] = "MovedDocument";
... ... @@ -753,4 +753,4 @@ class SubscriptionContent {
753 753 }
754 754 }
755 755  
756   -?>
757 756 \ No newline at end of file
  757 +?>
... ...