[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[15660] branches/2.0/lib

[<sy...@us...>]

Revision: 15660
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15660&view=rev
Author:   sylvieg
Date:     2008-11-17 20:00:46 +0000 (Mon, 17 Nov 2008)

Log Message:
-----------
backport back: fix itemId in trackerlist

Modified Paths:
--------------
    branches/2.0/lib/trackers/trackerlib.php
    branches/2.0/lib/wiki-plugins/wikiplugin_trackerlist.php

Modified: branches/2.0/lib/trackers/trackerlib.php
===================================================================
--- branches/2.0/lib/trackers/trackerlib.php	2008-11-17 19:04:11 UTC (rev 15659)
+++ branches/2.0/lib/trackers/trackerlib.php	2008-11-17 20:00:46 UTC (rev 15660)
@@ -577,7 +577,11 @@
 		$bindvars = array($trackerId);
 
 		if (!empty($filter)) {
-			$this->parse_filter($filter, $mid, $bindvars);
+			$mid2 = array();
+			$this->parse_filter($filter, $mid2, $bindvars);
+			if (!empty($mid2)) {
+				$mid .= ' AND '.implode(' AND ', $mid2);
+			}
 		}
 
 		if ( $status && ! $this->getSqlStatus($status, $mid, $bindvars, $trackerId) ) {

Modified: branches/2.0/lib/wiki-plugins/wikiplugin_trackerlist.php
===================================================================
--- branches/2.0/lib/wiki-plugins/wikiplugin_trackerlist.php	2008-11-17 19:04:11 UTC (rev 15659)
+++ branches/2.0/lib/wiki-plugins/wikiplugin_trackerlist.php	2008-11-17 20:00:46 UTC (rev 15660)
@@ -230,7 +230,7 @@
 			$exactvalue = '';
 		}
 		if (isset($itemId)) {
-			$filter = array('itemId', $itemId);
+			$filter = array('tti.`itemId`'=> $itemId);
 		} else {
 			$filter = '';
 		}


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