Subversion Repositories eFlore/Applications.del

Compare Revisions

Regard whitespace Rev 1799 → Rev 1800

/branches/v1.4-bore/services/modules/0.1/observations/ListeObservations.php
250,14 → 250,13
foreach($p['masque.tag']['AND'] as $tag) {
if(trim($tag) == ',') continue;
 
$subwhere[] = sprintf('LOWER(CONCAT(%s)) REGEXP %s',
$subwhere[] = sprintf('CONCAT(%s) LIKE %s',
DelTk::sqlAddIfNullPourConcat(array('vdi.mots_cles_texte', 'vdi.i_mots_cles_texte')),
$db->proteger(strtolower($tag)));
$db->proteger("%" . strtolower($tag) . "%"));
}
$req['where'][] = '(' . implode(' AND ', $subwhere) . ')';
}
else {
$req['where'][] = sprintf('LOWER(CONCAT(%s)) REGEXP %s',
} else {
$req['where'][] = sprintf('CONCAT(%s) LIKE %s',
DelTk::sqlAddIfNullPourConcat(array('vdi.mots_cles_texte', 'vdi.i_mots_cles_texte')),
$db->proteger(strtolower(implode('|', $p['masque.tag']['OR']))));
}
/branches/v1.4-bore/services/modules/0.1/DelTk.php
98,7 → 98,9
}
$words = DelTk::array_flatten($words);
$words = array_map('trim', $words);
return array($op => array_filter($words));
 
$ret = array($op => array_filter($words));
return $ret;
}