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 github.com:pandorafms/pandorafms into develop

This commit is contained in:
mdtrooper 2014-09-25 19:37:11 +02:00
parent 7d18c1fdeb 69d4d325a4
commit 1562923b71
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
View File

@ -233,7 +233,7 @@ DELETE FROM `trecon_script` WHERE id_recon_script=1;
-- ---------------------------------------------------------------------
-- Table `tagente_modulo`
-- ---------------------------------------------------------------------
ALTER TABLE tagente_modulo MODIFY COLUMN `post_process` double(18,15) default 0;
ALTER TABLE tagente_modulo MODIFY COLUMN `post_process` double(24,15) default 0;
/* 2014/08/18 */
-- ---------------------------------------------------------------------

2
pandora_console/include/config_process.php
View File

@ -23,7 +23,7 @@
* Pandora build version and version
*/
$build_version = 'PC140924';
$pandora_version = 'v5.1';
$pandora_version = 'v5.1SP1';
// Do not overwrite default timezone set if defined.
$script_tz = @date_default_timezone_get();

19
pandora_console/index.php Normal file → Executable file
View File

@ -365,15 +365,18 @@ if ($process_login) {
require_once("include/functions_update_manager.php");
enterprise_include_once("include/functions_update_manager.php");
if (enterprise_installed()) {
$result = update_manager_check_online_enterprise_packages_available();
if ($config["autoupdate"] == 1) {
if (enterprise_installed()) {
$result = update_manager_check_online_enterprise_packages_available();
}
else {
$result = update_manager_check_online_free_packages_available();
}
if ($result)
$_SESSION['new_update'] = 'new';
}
else {
$result = update_manager_check_online_free_packages_available();
}
if ($result)
$_SESSION['new_update'] = 'new';
//Set the initial global counter for chat.
users_get_last_global_counter('session');