Merge branch 'develop' into feature/admin_registration

This commit is contained in:
Andy Miller
2015-12-10 11:02:47 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -429,7 +429,7 @@ class AdminPlugin extends Plugin
$ext = '.' . ($format ? $format : 'html') . TWIG_EXT;
$twig->twig_vars['location'] = $this->template;
$twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '';
$twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '/';
$twig->twig_vars['admin_route'] = trim($this->config->get('plugins.admin.route'), '/');
$twig->twig_vars['base_url_relative'] =
$twig->twig_vars['base_url_simple'] . '/' . $twig->twig_vars['admin_route'];