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

Merge branch '693-UM_in_meta' into 'develop' 

Added lost url to um open online

See merge request !346
This commit is contained in:
vgilc 2017-04-05 17:00:06 +02:00
parent 0d21e46939 640fee4b82
commit 7094f8c1c3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_update_manager.php
View File

@ -363,10 +363,10 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
var applying_mr = "<?php echo __('Applying DB MR'); ?>\n";
</script>
<?php
$baseurl = ui_get_full_url(false, false, false, false);
echo "<p><b>There is a new version:</b> " . $result[0]['version'] . "</p>";
echo "<a href='javascript: update_last_package(\"" . base64_encode($result[0]["file_name"]) .
"\", \"" . $result[0]['version'] ."\");'>" .
"\", \"" . $result[0]['version'] ."\", \"" . $baseurl ."\");'>" .
__("Update to the last version") . "</a>";
}
else {

2
pandora_console/include/javascript/update_manager.js
View File

@ -891,7 +891,7 @@ function update_last_package(package, version, homeurl) {
$("#box_online .content").html(data['message']);
install_free_package_prev_step(package, version, homeurl);
install_free_package_prev_step(package, version, home_url);
}
else {
$("#box_online .content").html(data['message']);