Revize 1432
Přidáno uživatelem David Raška před asi 12 roky(ů)
| freenetis/branches/testing/application/libraries/Filter_form.php | ||
|---|---|---|
|
}
|
||
|
else
|
||
|
$values = $this->values[$i];
|
||
|
|
||
|
$notquery = false;
|
||
|
|
||
|
foreach ($values as $value)
|
||
|
{
|
||
| ... | ... | |
|
|
||
|
$sql = $this->opers[$this->operations[$i]]['sql'];
|
||
|
|
||
|
if (strpos($this->opers[$this->operations[$i]]['name'], 'not'))
|
||
|
$notquery = true;
|
||
|
|
||
|
if (isset($this->opers[$this->operations[$i]]['pattern']))
|
||
|
{
|
||
|
if (!preg_match(
|
||
| ... | ... | |
|
$sub_queries[] = $query;
|
||
|
}
|
||
|
|
||
|
$queries[] = "(".implode(" OR ", $sub_queries).")";
|
||
|
if ($notquery)
|
||
|
$operator = 'AND';
|
||
|
else
|
||
|
$operator = 'OR';
|
||
|
|
||
|
$queries[] = "(".implode(" $operator ", $sub_queries).")";
|
||
|
}
|
||
|
|
||
|
return implode(" AND ", $queries);
|
||
Také k dispozici: Unified diff
Opravy:
- #179: Oprava negaci u filteru. Negovane podminky by uz nemely delat neplechu a mely by fungovat korektne.
Upravy:
- #176: Opravou predchozi chyby se diky vedlejsim ucinkum vyresil aj tento pozadavek.