Merge branch 'release/1.7.8' into develop

This commit is contained in:
bnu 2014-11-24 16:30:02 +09:00
commit d4e10dd338
16 changed files with 75 additions and 60 deletions

View file

@ -289,7 +289,7 @@ class layoutAdminController extends layout
{
$oLayoutModel = getModel('layout');
if(!$force)
if($force)
{
$layoutInfo = $oLayoutModel->getLayout($layout_srl);
if($layoutInfo)