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

Merge branch '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente' into 'develop' 

Change load order of homeurl when load config, fix mysql login error dialog - #825

See merge request !461
This commit is contained in:
vgilc 2017-05-18 15:29:01 +02:00
parent 51538db187 2ccd799cbd
commit c10df32cf8
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/general/login_page.php
View File

@ -431,7 +431,6 @@ html_print_div(array('id' => 'forced_title_layer', 'class' => 'forced_title_laye
draggable: false, draggable: false,
modal: true, modal: true,
width: 600, width: 600,
height: 280,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"

24
pandora_console/include/config_process.php
View File

@ -110,18 +110,6 @@ require_once ($ownDir . 'constants.php');
require_once ($ownDir . 'functions_db.php'); require_once ($ownDir . 'functions_db.php');
require_once ($ownDir . 'functions.php'); require_once ($ownDir . 'functions.php');
db_select_engine();
$config['dbconnection'] = db_connect();
if (! defined ('EXTENSIONS_DIR'))
define ('EXTENSIONS_DIR', 'extensions');
if (! defined ('ENTERPRISE_DIR'))
define ('ENTERPRISE_DIR', 'enterprise');
require_once ($ownDir. 'functions_config.php');
// We need a timezone BEFORE calling config_process_config. // We need a timezone BEFORE calling config_process_config.
// If not we will get ugly warnings. Set Europe/Madrid by default // If not we will get ugly warnings. Set Europe/Madrid by default
// Later will be replaced by the good one. // Later will be replaced by the good one.
@ -153,6 +141,18 @@ else{
} }
} }
db_select_engine();
$config['dbconnection'] = db_connect();
if (! defined ('EXTENSIONS_DIR'))
define ('EXTENSIONS_DIR', 'extensions');
if (! defined ('ENTERPRISE_DIR'))
define ('ENTERPRISE_DIR', 'enterprise');
require_once ($ownDir. 'functions_config.php');
date_default_timezone_set("Europe/Madrid"); date_default_timezone_set("Europe/Madrid");