From d63cb2913f1eb9007c87532e062a6e3560152c7a Mon Sep 17 00:00:00 2001 From: "CORP\\phedor" Date: Wed, 21 Feb 2018 13:50:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BB?= =?UTF-8?q?=D0=B8=D1=8F=D0=BD=D0=B8=D0=B8=20=D0=BF=D1=83=D1=82=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Filter/Filter.php | 2 +- src/Path.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Filter/Filter.php b/src/Filter/Filter.php index 8140e8f..e5135dc 100644 --- a/src/Filter/Filter.php +++ b/src/Filter/Filter.php @@ -6,7 +6,7 @@ class Filter_Filter { public $processor; - public function __construct(/*.Filter_Filter.*/$processor) + public function __construct(/*.Controller_Action.*/$processor) { $this->processor = $processor; } diff --git a/src/Path.php b/src/Path.php index 9835f88..2af0fde 100644 --- a/src/Path.php +++ b/src/Path.php @@ -287,7 +287,7 @@ class Path $result [] = $parts->getParts(); } // При обьединении ссылок можно обьеденить path, query, fragment - $path = implode(self::SEPARATOR, call_user_func_array('array_merge', $result)); + $path = implode(self::SEPARATOR, self::optimize(call_user_func_array('array_merge', $result))); $parts0->url['path'] = ($parts0->isAbsolute()) ? '/' . $path : $path; return $parts0; }