Merge branch 'develop' into php7

This commit is contained in:
Kijin Sung 2015-12-09 13:14:01 +09:00
commit 5f5377fe85
5 changed files with 43 additions and 55 deletions

View file

@ -316,6 +316,12 @@ class layoutView extends layout
*/
function dispLayoutPreview()
{
if(!checkCSRF())
{
$this->stop('msg_invalid_request');
return new Object(-1, 'msg_invalid_request');
}
// admin check
// this act is admin view but in normal view because do not load admin css/js files
$logged_info = Context::get('logged_info');