Merge #1735 getDbInfo -> getDBInfo by qkrcjfgus33

* pr/1735:
  Update admin.admin.controller.php
  Update install.controller.php
  getDbInfo -> getDBInfo
This commit is contained in:
Kijin Sung 2015-10-08 15:08:56 +09:00
commit 57e9077e8c
2 changed files with 4 additions and 4 deletions

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);