tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
axl89 2016-05-25 16:38:28 +02:00
parent 79219cfc9f 921a79bd30
commit 3179a206a4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_tactical.php
View File

@ -313,10 +313,16 @@ function tactical_get_data ($id_user = false, $user_strict = false, $acltags, $r
else { else {
if ($user_strict) { if ($user_strict) {
if (empty($acltags)) {
$_tag_condition = '';
}
else {
$_tag_condition = 'AND ' . tags_get_acl_tags_module_condition($acltags,'tae'); $_tag_condition = 'AND ' . tags_get_acl_tags_module_condition($acltags,'tae');
} }
else }
else {
$_tag_condition = ''; $_tag_condition = '';
}
$result_list = db_get_all_rows_sql("SELECT COUNT(*) as contado, estado $result_list = db_get_all_rows_sql("SELECT COUNT(*) as contado, estado
FROM tagente_estado tae INNER JOIN tagente ta FROM tagente_estado tae INNER JOIN tagente ta