hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 05:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-01-16 20:19:20 +01:00
parent b37703b506 b24c6bab43
commit af860e2fa6
26 changed files with 661 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/deprecated/push.api.php
View File

@@ -843,8 +843,8 @@ function sqlFromFilters($usr, $filters)
foreach ($filters->countries as $country)
{
$c['country' . $n] = $country;
$n++;
}
$n++;
$precise.=" AND usr.pays IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
@@ -855,8 +855,8 @@ function sqlFromFilters($usr, $filters)
foreach ($filters->activite as $activite)
{
$c['activite' . $n] = $activite;
$n++;
}
$n++;
$precise.=" AND usr.activite IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
@@ -867,8 +867,8 @@ function sqlFromFilters($usr, $filters)
foreach ($filters->fonction as $fonction)
{
$c['fonction' . $n] = $fonction;
$n++;
}
$n++;
$precise.=" AND usr.fonction IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
@@ -879,8 +879,8 @@ function sqlFromFilters($usr, $filters)
foreach ($filters->societe as $societe)
{
$c['societe' . $n] = $societe;
$n++;
}
$n++;
$precise.=" AND usr.societe IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
@@ -891,8 +891,8 @@ function sqlFromFilters($usr, $filters)
foreach ($filters->template as $template)
{
$c['template' . $n] = $template;
$n++;
}
$n++;
$precise.=" AND usr.lastModel IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}