Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14)

Conflicts:
	classes/context/Context.class.php
	modules/point/tpl/config.html
This commit is contained in:
Kijin Sung 2015-12-02 14:38:23 +09:00
commit a22e69b7ec
59 changed files with 249 additions and 36 deletions

View file

@ -212,8 +212,9 @@ class boardController extends board
}
// alert an message
$this->setRedirectUrl(getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '', 'page', Context::get('page'), 'document_srl', ''));
$this->add('mid', Context::get('mid'));
$this->add('page', $output->get('page'));
$this->add('page', Context::get('page'));
$this->setMessage('success_deleted');
}