UPDATE: HLEB v1.6.70

This commit is contained in:
Evg 2022-08-26 15:31:42 +03:00
parent e059fa0d04
commit da75d69ddf
3 changed files with 4 additions and 12 deletions

View File

@ -35,13 +35,7 @@ class Translate
return self::$langData;
}
if (defined('HLEB_OPTIONAL_MODULE_SELECTION') && HLEB_OPTIONAL_MODULE_SELECTION) {
$data1 = require_once __DIR__ . '/../Language/' . $lang . '.php';
$data2 = require_once HLEB_GLOBAL_DIRECTORY . '/modules/' . HLEB_MODULE_NAME . '/App/Language/' . $lang . '.php';
$data = array_merge($data1, $data2);
} else {
$data = require_once __DIR__ . '/../Language/' . $lang . '.php';
}
$data = require_once __DIR__ . '/../Language/' . $lang . '.php';
self::$langData[$lang] = $data;
return self::$langData;

View File

@ -21,7 +21,7 @@
],
"require": {
"php": ">=7.4.0",
"phphleb/framework": ">=1.6.63",
"phphleb/framework": ">=1.6.70",
"phphleb/imageresizer": "dev-master",
"erusev/parsedown": "^1.8.0@beta"
},

View File

@ -1,13 +1,13 @@
<?php
/**
* @author Foma Tuturov <fomiash@yandex.ru>
* @author Evgeny Konchik <budo@narod.ru>
*/
// All calls are sent to this file.
// Все вызовы направляются в этот файл.
define('HLEB_START', microtime(true));
define('HLEB_FRAME_VERSION', "1.6.63");
define('HLEB_FRAME_VERSION', "1.6.70");
define('HLEB_PUBLIC_DIR', __DIR__);
define('HLEB_DIR', __DIR__ . '/../');
@ -26,5 +26,3 @@ header("X-Frame-Options: SAMEORIGIN");
require __DIR__ . '/../vendor/phphleb/framework/bootstrap.php';
exit();