Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

php7 환경에서 발생하는 오류 수정 #1704

Merged
2 commits merged into from
Sep 22, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions classes/db/DB.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,16 +215,18 @@ function getSupportedList()
*/
function getEnableList()
{
if(!$this->supported_list)
is_a($this, 'DB') ? $self = $this : $self = self::getInstance();

if(!$self->supported_list)
{
$oDB = new DB();
$this->supported_list = $oDB->_getSupportedList();
$self->supported_list = $oDB->_getSupportedList();
}

$enableList = array();
if(is_array($this->supported_list))
if(is_array($self->supported_list))
{
foreach($this->supported_list AS $key => $value)
foreach($self->supported_list AS $key => $value)
{
if($value->enable)
{
Expand All @@ -242,16 +244,18 @@ function getEnableList()
*/
function getDisableList()
{
if(!$this->supported_list)
is_a($this, 'DB') ? $self = $this : $self = self::getInstance();

if(!$self->supported_list)
{
$oDB = new DB();
$this->supported_list = $oDB->_getSupportedList();
$self->supported_list = $oDB->_getSupportedList();
}

$disableList = array();
if(is_array($this->supported_list))
if(is_array($self->supported_list))
{
foreach($this->supported_list AS $key => $value)
foreach($self->supported_list AS $key => $value)
{
if(!$value->enable)
{
Expand Down