From 602928a92780462cb471b2075f9108db37439b1e Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Tue, 11 Dec 2012 12:32:42 +0000 Subject: [PATCH] 2012-12-11 Juan Manuel Ramon * include/functions_groups.php: Fixed propagate parameter in function groups_get_parent. * extensions/update_manager.php: Check UM is installed. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7256 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/extensions/update_manager.php | 8 +++++--- pandora_console/include/functions_groups.php | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8b14da90fb..8d7196a42a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-12-11 Juan Manuel Ramon + + * include/functions_groups.php: Fixed propagate parameter in + function groups_get_parent. + * extensions/update_manager.php: Check UM is installed. + 2012-12-11 Sergio Martin * include/functions_network_components.php: Improve diff --git a/pandora_console/extensions/update_manager.php b/pandora_console/extensions/update_manager.php index 91d4d1fa51..0af9aa4b6f 100644 --- a/pandora_console/extensions/update_manager.php +++ b/pandora_console/extensions/update_manager.php @@ -97,10 +97,12 @@ function pandora_update_manager_install () { load_update_manager_lib (); - if ($config['update_manager_installed'] == 1) { - return; + if (isset($config['update_manager_installed'])) { + if ($config['update_manager_installed'] == 1) { + return; + } } - + /* SQL installation */ switch ($config['dbtype']) { case 'mysql': diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 272000908a..4c62b4a6c2 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -269,8 +269,9 @@ function groups_get_parents($parent, $onlyPropagate = false, $groups = null) { if ($group['id_grupo'] == 0) { continue; } + if (($group['id_grupo'] == $parent) && ($group['propagate'] || !$onlyPropagate)) { - $return = $return + array($group['id_grupo'] => $group) + groups_get_parents($group['parent'], $groups); + $return = $return + array($group['id_grupo'] => $group) + groups_get_parents($group['parent'], $onlyPropagate, $groups); } }