[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[52187] branches/13.x/lib/trackers/trackerlib.php

[<jon...@us...>]

Revision: 52187
          http://sourceforge.net/p/tikiwiki/code/52187
Author:   jonnybradley
Date:     2014-07-30 10:10:07 +0000 (Wed, 30 Jul 2014)
Log Message:
-----------
[FIX] trackers: Fix drop-down menu of options for ItemLink fields when one or more of the multiple display fields are also ItemLinks

Modified Paths:
--------------
    branches/13.x/lib/trackers/trackerlib.php

Modified: branches/13.x/lib/trackers/trackerlib.php
===================================================================
--- branches/13.x/lib/trackers/trackerlib.php	2014-07-30 07:26:23 UTC (rev 52186)
+++ branches/13.x/lib/trackers/trackerlib.php	2014-07-30 10:10:07 UTC (rev 52187)
@@ -731,7 +731,6 @@
 			if ($myfield=$definition->getField($field)) {
 				$is_date=($myfield['type']=='f');
 				$is_trackerlink=($myfield['type']=='r');
-				$tmp="";
 				$tmp=$this->get_all_items($trackerId, $field, $status, false);//deliberatly do not check perm on categs on items
 				$options = $myfield['options_map'];
 				foreach ($tmp as $key => $value) {
@@ -739,8 +738,9 @@
 						$value=$this->date_format("%e/%m/%y", $value);
 					}
 					if ($is_trackerlink && $options['displayFieldsList']) {
-						// If $options[3] is empty, concat_item_from_fieldslist returns nothing
-						$value=$this->concat_item_from_fieldslist($options['trackerId'], $value, $options['displayFieldsList'], $strip_tags);
+						$item = $this->get_tracker_item($key);
+						$itemId = $item[$field];
+						$value=$this->concat_item_from_fieldslist($options['trackerId'], $itemId, $options['displayFieldsList'], $strip_tags);
 					}
 					if (!empty($res[$key])) {
 						$res[$key].=$separator.$value;

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