dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// layout fix

Browse Source
This commit is contained in:
Rémi Gaillard
2013-10-25 17:30:10 +02:00
parent 50bc046671
commit c67e71ca59
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
classes/controller/AdminController.php
View File

@@ -682,6 +682,7 @@ class AdminControllerCore extends Controller
'export_content' => $content
)
);
$this->layout = 'layout-export.tpl';
}
@@ -1372,12 +1373,14 @@ class AdminControllerCore extends Controller
foreach (array('errors', 'warnings', 'informations', 'confirmations') as $type)
$this->context->smarty->assign($type, $this->json ? Tools::jsonEncode(array_unique($this->$type)) : array_unique($this->$type));
$this->context->smarty->assign('page', $this->json ? Tools::jsonEncode($page) : $page);
if (!$this->ajax)
$this->smartyOutputContent(array($header_tpl, $this->layout, $footer_tpl));
else
$this->smartyOutputContent($this->layout);
$this->context->smarty->assign(array(
'page' => $this->json ? Tools::jsonEncode($page) : $page,
'header' => $this->context->smarty->fetch($header_tpl),
'footer' => $this->context->smarty->fetch($footer_tpl)
)
);
$this->smartyOutputContent($this->layout);
}
/**