Merge branch 'v3-stable' into beta

This commit is contained in:
Andre Lorbach 2011-10-25 13:53:31 +02:00
commit 0ca9204246

View File

@ -399,7 +399,7 @@ abstract class Report {
$aNewDisplayFilter['FilterType'] = $content['LN_REPORT_FILTERTYPE_STRING'];
// Set Filterdisplay
$aNewDisplayFilter['FilterDisplay'] .= $aNewDisplayFilter['FilterCaption'] . " ";
$aNewDisplayFilter['FilterDisplay'] = $aNewDisplayFilter['FilterCaption'] . " ";
if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_INCLUDE )
{
if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_SEARCHFULL )
@ -421,7 +421,7 @@ abstract class Report {
$aNewDisplayFilter['FilterType'] = $content['LN_REPORT_FILTERTYPE_NUMBER'];
// Set Filterdisplay
$aNewDisplayFilter['FilterDisplay'] .= $aNewDisplayFilter['FilterCaption'] . " ";
$aNewDisplayFilter['FilterDisplay'] = $aNewDisplayFilter['FilterCaption'] . " ";
if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_INCLUDE )
$aNewDisplayFilter['FilterDisplay'] .= "== " . $tmpFilter[FILTER_VALUE];
else if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_EXCLUDE )