diff --git a/app/src/Util/Twig/HtmlHelper.php b/app/src/Util/Twig/HtmlHelper.php index 850a119f..7148a87f 100644 --- a/app/src/Util/Twig/HtmlHelper.php +++ b/app/src/Util/Twig/HtmlHelper.php @@ -25,7 +25,7 @@ function (Request $request, $name, $type, array $attrs = [], array $option_attrs ), new TwigFunction( 'url', - function (Request $request, string $controller, string $action, array $args = [], $reused = false, $full_url = false) { + function (Request $request, string $controller, string $action, array $args = [], $reused = false, $full_url = false, $use_base_dir = true) { $args = array_merge( [ 'controller' => $controller, @@ -33,7 +33,7 @@ function (Request $request, string $controller, string $action, array $args = [] ], $args ); - return Html::url($request, $args, $reused, $full_url); + return Html::url($request, $args, $reused, $full_url, $use_base_dir); }, ['is_safe' => ['html']] ), diff --git a/app/src/Web/Html.php b/app/src/Web/Html.php index 9442f8ca..1473a1ab 100644 --- a/app/src/Web/Html.php +++ b/app/src/Web/Html.php @@ -19,9 +19,10 @@ class Html * @param array $args * @param bool $reused * @param bool $full_url + * @param bool $use_base_dir * @return string */ - public static function url(Request $request, $args = array(), $reused = false, $full_url = false) + public static function url(Request $request, $args = array(), $reused = false, $full_url = false, $use_base_dir = true) { // 現在のURLの引数を引き継ぐ if ($reused == true) { @@ -84,7 +85,11 @@ public static function url(Request $request, $args = array(), $reused = false, $ $params[] = $device_name; } - $url = $request->baseDirectory . Config::get('DIRECTORY_INDEX'); + if($use_base_dir) { + $url = $request->baseDirectory . Config::get('DIRECTORY_INDEX'); + }else{ + $url = "/" . Config::get('DIRECTORY_INDEX'); + } if (count($params)) { $url .= '?' . implode('&', $params); } diff --git a/app/twig_templates/admin/blog_plugins/plugin_search.twig b/app/twig_templates/admin/blog_plugins/plugin_search.twig index a881f688..78368880 100644 --- a/app/twig_templates/admin/blog_plugins/plugin_search.twig +++ b/app/twig_templates/admin/blog_plugins/plugin_search.twig @@ -30,7 +30,7 @@ {{ _('Download') }}