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

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

This commit is contained in:
m-lopez-f 2016-06-10 11:11:23 +02:00
parent d058d096d7 260c27f44a
commit 2303bc9356
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/godmode/update_manager/update_manager.setup.php
View File

@ -27,8 +27,7 @@ if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_us
$action_update_url_update_manager = (bool)get_parameter(
'action_update_url_update_manager', 0);
$url_update_manager = get_parameter('url_update_manager',
$config['url_update_manager']);
$url_update_manager = get_parameter('url_update_manager');
$update_manager_proxy_server = get_parameter('update_manager_proxy_server');
$update_manager_proxy_port = get_parameter('update_manager_proxy_port');
$update_manager_proxy_user = get_parameter('update_manager_proxy_user');