[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[56109] trunk/lib/user/monitorlib.php

[<ux...@us...>]

Revision: 56109
          http://sourceforge.net/p/tikiwiki/code/56109
Author:   uxeric
Date:     2015-08-31 18:08:53 +0000 (Mon, 31 Aug 2015)
Log Message:
-----------
[FIX] In monitorlib function getApplicableEvents, removed duplicate case for trackeritem

Modified Paths:
--------------
    trunk/lib/user/monitorlib.php

Modified: trunk/lib/user/monitorlib.php
===================================================================
--- trunk/lib/user/monitorlib.php	2015-08-31 17:56:34 UTC (rev 56108)
+++ trunk/lib/user/monitorlib.php	2015-08-31 18:08:53 UTC (rev 56109)
@@ -56,7 +56,7 @@
 
 		// Include object directly
 		$options[] = $this->gatherOptions($userId, $events, $type, $object);
-		
+
 		// Include translation set
 		if ($this->hasMultilingual($type)) {
 			// Using fake types - wiki page -> wiki page trans
@@ -132,7 +132,7 @@
 				return "category:$categoryId";
 			}, $categories);
 		}
-		
+
 		list($type, $objectId) = $this->cleanObjectId($type, $object);
 		$targets[] = 'global';
 		$targets[] = "$type:$objectId";
@@ -251,7 +251,7 @@
 
 		$this->queue[$eventId]['events'][] = $registeredEvent;
 	}
-	
+
 	function directNotification($priority, $userId, $event, $args)
 	{
 		$this->queue[$args['EVENT_ID']] = [
@@ -289,7 +289,7 @@
 			if (! empty($sendTo)) {
 				$monitormail->queue($item['event'], $args, $sendTo);
 			}
-				
+
 		}
 
 		$tx->commit();
@@ -297,7 +297,7 @@
 		// Send email (rather slow, dealing with external services) after Tiki's management is done
 		$monitormail->sendQueue();
 	}
-	
+
 	private function finalHandleEvent($args, $events, $force)
 	{
 		$currentUser = TikiLib::lib('login')->getUserId();
@@ -478,12 +478,6 @@
 				'tiki.trackeritem.save' => ['global' => false, 'local' => false, 'label' => tr('Any item activity')],
 				'tiki.trackeritem.create' => ['global' => true, 'local' => false, 'label' => tr('New items')],
 			];
-		case 'trackeritem':
-			return [
-				'tiki.save' => ['global' => false, 'local' => true, 'label' => tr('Any activity')],
-				'tiki.trackeritem.save' => ['global' => false, 'local' => false, 'label' => tr('Any item activity')],
-				'tiki.trackeritem.create' => ['global' => true, 'local' => false, 'label' => tr('New items')],
-			];
 		case 'user':
 			return [
 				'tiki.mustread.required' => ['global' => false, 'local' => true, 'label' => tr('Action Required')],

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.