Merge pull request #639 from bjrambo/pr/Illegal-error

알림센터의 자잘한 워닝에러 확인하여 수정.
This commit is contained in:
Johnny 2016-11-22 08:10:27 +09:00 committed by GitHub
commit 209ccd148a
2 changed files with 11 additions and 10 deletions

View file

@ -82,11 +82,13 @@ class ncenterliteAdminController extends ncenterlite
$this->setMessage('success_updated');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
if (Context::get('success_return_url'))
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', $obj->disp_act);
header('location: ' . $returnUrl);
return;
$this->setRedirectUrl(Context::get('success_return_url'));
}
else
{
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', $obj->disp_act));
}
}

View file

@ -24,12 +24,11 @@ class ncenterliteModel extends ncenterlite
{
if(count($config->use) && !is_array(array_first($config->use)))
{
$config->use['mention']['web'] = $config->use['mention'];
$config->use['comment']['web'] = $config->use['comment'];
$config->use['comment_comment']['web'] = $config->use['comment_comment'];
$config->use['vote']['web'] = $config->use['vote'];
$config->use['message']['web'] = $config->use['message'];
$config->use['admin_content']['web'] = $config->use['admin_content'];
foreach($config->use as $key => $value)
{
$config->use[$key] = array();
$config->use[$key]['web'] = $value;
}
getController('module')->insertModuleConfig('ncenterlite', $config);
}
}