DEV: Upgrade to HLEB v1.6.50

This commit is contained in:
Evg 2022-04-11 17:14:29 +03:00
parent da70ccac81
commit 9f61146001
3 changed files with 5 additions and 5 deletions

View file

@ -43,10 +43,9 @@ final class AddressBar
$endElement = explode('/', $address);
$fileUrl = stripos(end($endElement), '.') !== false;
$relAddress = "";
if (!empty($address)) {
if (!$fileUrl) {
if ($address[strlen($address) - 1] == '/') {
if ($address[strlen($address) - 1] === '/') {
$relAddress = $this->inputParameters['HLEB_PROJECT_ENDING_URL'] ? $address : rtrim($address, "/");
} else {
$relAddress = $this->inputParameters['HLEB_PROJECT_ENDING_URL'] ? $address . '/' : $address;
@ -87,6 +86,7 @@ final class AddressBar
// Check if the URL is correct.
// Проверка на корректность URL.
$realUrl = $realProtocol . (preg_replace('/\/{2,}/', '/', $realHostWww . $relAddress)) . $realParameters;
$partsOfActualUri = explode('?', $this->inputParameters['SERVER']['REQUEST_URI']);
$firstActualUri = rawurldecode(array_shift($partsOfActualUri));
$firstActualParams = count($partsOfActualUri) > 0 ? '?' . implode('?', $partsOfActualUri) : '';
@ -96,7 +96,7 @@ final class AddressBar
$realUrl = rtrim($realUrl, '/');
$actualUrl = rtrim($actualUrl, '/');
}
if ($realUrl !== $actualUrl) {
if ($realUrl !== $actualUrl && $address !== '/') {
$this->redirect($realUrl);
}
return $realUrl;

View file

@ -1,6 +1,6 @@
<?php
define('HLEB_PROJECT_FULL_VERSION', '1.6.4');
define('HLEB_PROJECT_FULL_VERSION', '1.6.50');
require HLEB_PROJECT_DIRECTORY . '/Scheme/App/Controllers/MainController.php';

View file

@ -6,7 +6,7 @@
// All calls are sent to this file.
// Все вызовы направляются в этот файл.
define('HLEB_START', microtime(true));
define('HLEB_FRAME_VERSION', "1.6.4");
define('HLEB_FRAME_VERSION', "1.6.50");
define('HLEB_PUBLIC_DIR', __DIR__);
// General headers.