diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 05d6c56e..588e8f9a 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -15,11 +15,12 @@ class Controller extends BaseController * Display a view but pull it from the active skin * @param string $template * @param array $vars + * @param array $merge_data * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function view(string $template, array $vars=[]) + public function view($template, array $vars=[], $merge_data=[]) { $tpl = 'layouts/' . config('phpvms.skin') . '/' . $template; - return view($tpl, $vars); + return view($tpl, $vars, $merge_data); } } diff --git a/app/helpers.php b/app/helpers.php index 5726e0e8..2c52a972 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1,5 +1,18 @@