Re: [Tikiwiki-devel] [Tikiwiki-cvs] tiki/lib/trackers trackerlib.php, 1.147, 1.148

[Sylvie G. <sgr...@gm...>]

hangerman,
Be careful to check for previous compatibility.
Do we need a parameter to a textarea field: wiki-parseable?
My 2 cents
sylvie

On Tue, 2006-11-28 at 07:23 -0800, han...@us...
wrote:
> Update of /cvsroot/tikiwiki/tiki/lib/trackers
> In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30952/lib/trackers
> 
> Modified Files:
> 	trackerlib.php 
> Log Message:
> Wiki parsed string for tracker Item text area
> 
> Index: trackerlib.php
> ===================================================================
> RCS file: /cvsroot/tikiwiki/tiki/lib/trackers/trackerlib.php,v
> retrieving revision 1.147
> retrieving revision 1.148
> diff -u -d -r1.147 -r1.148
> --- trackerlib.php	27 Nov 2006 08:45:46 -0000	1.147
> +++ trackerlib.php	28 Nov 2006 15:23:27 -0000	1.148
> @@ -350,21 +350,25 @@
>  
>  	/* experimental shared */
>  	function get_item_value($trackerId,$itemId,$fieldId) {
> +	        $res=""; 
> +	        $fieldInfo=$this->get_tracker_field($fieldId);
> +	        $isTextArea=($fieldInfo['type']=='a');
>  		$basequery = "select ttif.`value` from `tiki_tracker_items` tti, `tiki_tracker_fields` ttf, `tiki_tracker_item_fields` ttif where tti.`trackerId`=ttf.`trackerId` and ttif.`fieldId`=ttf.`fieldId` and ttf.`trackerId`=? and ttf.`fieldId`=? and ttif.`itemId`=? ";
>  		if ($this->is_multilingual($fieldId)=='y') {
>  	        	global $language;
>  	        	$query= "$basequery  and ttif.`lang`=?";
>  			$res=$this->getOne($query,array((int) $trackerId,(int)$fieldId,(int)$itemId,(string)$language));
> -			// Check if a translation was given
> -			if (isset($res)&& $res!='' )
> -		  	return $res;
>  		}
> -		//Fields is not multilingual
> -	       $query = $basequery;
> -    	       return $this->getOne($query,array((int) $trackerId,(int)$fieldId,(int)$itemId));
> -	
> -	
> -		
> +	       if (!isset($res) || $res=='' ){
> +	            //Try normal query
> +                    $query = $basequery;
> +                    $res=$this->getOne($query,array((int) $trackerId,(int)$fieldId,(int)$itemId));
> +               }
> +               if ($isTextArea){
> +                    global $tikilib;
> +                    return $tikilib->parse_data($res,'full');
> +               } else
> +		    return $res;
>  	}
>  
>  	/* experimental shared */
> 
> 
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share your
> opinions on IT & business topics through brief surveys - and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs