From: <nk...@us...> - 2013-10-10 14:34:11
|
Revision: 47948 http://sourceforge.net/p/tikiwiki/code/47948 Author: nkoth Date: 2013-10-10 14:34:06 +0000 (Thu, 10 Oct 2013) Log Message: ----------- [FIX] Deleted trackeritems were still being indexed as Unknown Modified Paths: -------------- branches/12.x/lib/core/Search/ContentSource/TrackerItemSource.php branches/12.x/lib/setup/events.php branches/12.x/lib/trackers/trackerlib.php Modified: branches/12.x/lib/core/Search/ContentSource/TrackerItemSource.php =================================================================== --- branches/12.x/lib/core/Search/ContentSource/TrackerItemSource.php 2013-10-09 20:36:27 UTC (rev 47947) +++ branches/12.x/lib/core/Search/ContentSource/TrackerItemSource.php 2013-10-10 14:34:06 UTC (rev 47948) @@ -43,6 +43,10 @@ $item = $this->trklib->get_tracker_item($objectId); + if (empty($item)) { + return false; + } + $itemObject = Tracker_Item::fromInfo($item); $permNeeded = $itemObject->getViewPermission(); Modified: branches/12.x/lib/setup/events.php =================================================================== --- branches/12.x/lib/setup/events.php 2013-10-09 20:36:27 UTC (rev 47947) +++ branches/12.x/lib/setup/events.php 2013-10-10 14:34:06 UTC (rev 47948) @@ -147,6 +147,7 @@ $events->bind('tiki.trackeritem.update', 'tiki.trackeritem.save'); $events->bind('tiki.trackeritem.create', 'tiki.trackeritem.save'); $events->bind('tiki.trackeritem.save', 'tiki.save'); + $events->bind('tiki.trackeritem.delete', 'tiki.save'); $events->bind('tiki.file.update', 'tiki.file.save'); $events->bind('tiki.file.create', 'tiki.file.save'); Modified: branches/12.x/lib/trackers/trackerlib.php =================================================================== --- branches/12.x/lib/trackers/trackerlib.php 2013-10-09 20:36:27 UTC (rev 47947) +++ branches/12.x/lib/trackers/trackerlib.php 2013-10-10 14:34:06 UTC (rev 47948) @@ -2274,11 +2274,18 @@ $this->remove_tracker_item($i); } - require_once('lib/search/refresh-functions.php'); - refresh_index('trackeritem', $itemId); - $tx->commit(); + TikiLib::events()->trigger( + 'tiki.trackeritem.delete', + array( + 'type' => 'trackeritem', + 'object' => $itemId, + 'trackerId' => $trackerId, + 'user' => $GLOBALS['user'], + ) + ); + return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |