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

2012-12-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* 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
This commit is contained in:
juanmanuelr 2012-12-11 12:32:42 +00:00
parent 4d4df77228
commit 602928a927
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-12-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* 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 <sergio.martin@artica.es>
* include/functions_network_components.php: Improve

8
pandora_console/extensions/update_manager.php
View File

@ -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':

3
pandora_console/include/functions_groups.php
View File

@ -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);
}
}