Merge branch 'v3-stable' into beta

This commit is contained in:
Andre Lorbach 2011-10-06 16:44:57 +02:00
commit 6638b6fd44

View File

@ -927,11 +927,21 @@ abstract class LogStream {
break; break;
/* END WebLog based fields */ /* END WebLog based fields */
default: default:
/* OLD CODE
// Custom Field, try to guess field! // Custom Field, try to guess field!
if ( isset($fields[$tmpArray[FILTER_TMP_KEY]]) && isset($fields[$tmpArray[FILTER_TMP_KEY]]['SearchField']) ) if ( isset($fields[$tmpArray[FILTER_TMP_KEY]]) && isset($fields[$tmpArray[FILTER_TMP_KEY]]['SearchField']) )
{ {
$tmpKeyName = $tmpArray[FILTER_TMP_KEY]; $tmpKeyName = $tmpArray[FILTER_TMP_KEY];
*/
// Custom Field, try to find field!
foreach ($fields as $aField) {
if ($aField['SearchField'] == $tmpArray[FILTER_TMP_KEY]) {
$tmpKeyName = $aField['FieldID'];
break;
}
}
if ( isset($fields[$tmpKeyName]) && isset($fields[$tmpKeyName]['SearchField']) )
{
$tmpFilterType = $fields[$tmpKeyName]['FieldType']; $tmpFilterType = $fields[$tmpKeyName]['FieldType'];
// Handle numeric fields! // Handle numeric fields!