diff options
| -rw-r--r-- | phpBB/adm/style/permission_roles_mask.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/template/twig/node/includeasset.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html index 277310edbf..42a7fc3e4e 100644 --- a/phpBB/adm/style/permission_roles_mask.html +++ b/phpBB/adm/style/permission_roles_mask.html @@ -25,7 +25,7 @@ <a href="{role_mask.groups.U_PROFILE}">{role_mask.groups.GROUP_NAME}</a><!-- IF not role_mask.groups.S_LAST_ROW --> :: <!-- ENDIF --> <!-- BEGINELSE --> {L_GROUPS_NOT_ASSIGNED} - <!-- END users --> + <!-- END groups --> </td> </tr> </tbody> diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php index ae113cadc8..990b1c984f 100644 --- a/phpBB/includes/template/twig/node/includeasset.php +++ b/phpBB/includes/template/twig/node/includeasset.php @@ -34,7 +34,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node ->subcompile($this->getNode('expr')) ->raw(";\n") ->write("\$asset = new phpbb_template_asset(\$asset_file);\n") - ->write("if (\$asset->is_relative()) {\n") + ->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n") ->indent() ->write("\$asset_path = \$asset->get_path();") ->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n") |