fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-25 21:32:51 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
bnu 2015-12-08 17:23:01 +09:00
commit c4ea86bd05
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/admin/admin.admin.controller.php
View file

@ -501,7 +501,7 @@ class adminAdminController extends admin
$vars = Context::getRequestVars();
$oInstallController = getController('install');
$db_info = Context::getDbInfo();
$db_info = Context::getDBInfo();
$db_info->use_sitelock = ($vars->use_sitelock) ? $vars->use_sitelock : 'N';
$db_info->sitelock_title = $vars->sitelock_title;
@ -543,7 +543,7 @@ class adminAdminController extends admin
{
$vars = Context::getRequestVars();
$db_info = Context::getDbInfo();
$db_info = Context::getDBInfo();
$white_object = $vars->embed_white_object;
$white_object = preg_replace("/[\r\n|\r|\n]+/", '|@|', $white_object);

4
modules/install/install.controller.php
View file

@ -600,7 +600,7 @@ class installController extends install
{
$db_tmp_config_file = $this->db_tmp_config_file;
$db_info = Context::getDbInfo();
$db_info = Context::getDBInfo();
if(!$db_info) return;
$buff = $this->_getDBConfigFileContents($db_info);
@ -641,7 +641,7 @@ class installController extends install
$config_file = Context::getConfigFile();
//if(file_exists($config_file)) return;
$db_info = Context::getDbInfo();
$db_info = Context::getDBInfo();
if(!$db_info) return;
$buff = $this->_getDBConfigFileContents($db_info);