maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Override the "view" method of the CI_Loader class so that layouts are supported

Browse source
This commit is contained in:
alextselegidis 2021-11-15 08:53:59 +01:00
parent b7c39e94a2
commit b7bcaa86be
1 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
application/core/EA_Loader.php
View file

@ -44,22 +44,47 @@ class EA_Loader extends CI_Loader {
* Loads "layout" files. * Loads "layout" files.
* *
* @param string $layout Path to the layout view file. * @param string $layout Path to the layout view file.
* @param string $page Path to the page view file. * @param string $page Path to the page view file.
* @param array $vars An associative array of data to be extracted for use in the view * @param array $vars An associative array of data to be extracted for use in the view
* @param bool $return Whether to return the view output or leave it to the Output class * @param bool $return Whether to return the view output or leave it to the Output class
* *
* @return object|string * @return object|string
*
* remove this
*/ */
public function layout(string $layout, string $page, array $vars = [], bool $return = FALSE) public function layout(string $layout, string $page, array $vars = [], bool $return = FALSE)
{ {
$vars['page_path'] = APPPATH . 'views/' . $page . '.php'; $vars['page_path'] = APPPATH . 'views/' . $page . '.php';
$vars['styles'] = $vars['styles'] ?? []; $vars['styles'] = $vars['styles'] ?? [];
$vars['scripts'] = $vars['scripts'] ?? []; $vars['scripts'] = $vars['scripts'] ?? [];
$vars['global_variables'] = $vars['global_variables'] ?? []; $vars['global_variables'] = $vars['global_variables'] ?? [];
return $this->view($layout, $vars, $return); return $this->view($layout, $vars, $return);
} }
/**
* Override the original view loader method so that layouts are also supported.
*
* @param string $view View filename.
* @param array $vars An associative array of data to be extracted for use in the view.
* @param bool $return Whether to return the view output or leave it to the Output class.
*
* @return object
*/
public function view($view, $vars = [], $return = FALSE): object
{
$result = $this->_ci_load(['_ci_view' => $view, '_ci_vars' => $this->_ci_prepare_view_vars($vars), '_ci_return' => $return]);
$layout = config('layout');
if ($layout)
{
$result = $this->_ci_load(['_ci_view' => $layout, '_ci_vars' => $this->_ci_prepare_view_vars($vars), '_ci_return' => $return]);
}
return $result;
}
} }