Merge branch 'refs/heads/release' into subscribe2.0

esf_core/config/database.php

@@ -52,6 +52,7 @@ $active_record = TRUE;
 //$dsn_esf = "dbdriver://$conf_db_user:$conf_db_password@$conf_db_host/$conf_db_name?char_set=$conf_db_charset&dbcollat=utf8_general_ci&cache_on=false";
 $IpHostAllow =explode('.',get_ip());
 
+
 if($IpHostAllow['0']=='127')
 {
     $conf_db_host       ='njesfdbmastervip.house365.com';