Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-11 22:38:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-12-30 20:16:27 +01:00
parent b04628f890
commit 54409c9f12
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataStorage/Database/GrammarAbstract.php
View File

@ -285,7 +285,7 @@ abstract class GrammarAbstract
$fullSystem = ''; $fullSystem = '';
foreach ($split as $key => $system) { foreach ($split as $key => $system) {
$fullSystem .= '.' . $identifier . ($key === 0 ? $prefix : '') . $system . $identifier; $fullSystem .= '.' . ($system !== '*' ? $identifier : '') . ($key === 0 && $system !== '*' ? $prefix : '') . $system . ($system !== '*' ? $identifier : '');
} }
return \ltrim($fullSystem, '.'); return \ltrim($fullSystem, '.');

2
Localization/Localization.php
View File

@ -160,7 +160,7 @@ final class Localization
$files = \glob(__DIR__ . '/../Localization/Defaults/Definitions/' . $langCode . '_' . $countryCode); $files = \glob(__DIR__ . '/../Localization/Defaults/Definitions/' . $langCode . '_' . $countryCode);
foreach ($files as $file) { foreach ($files as $file) {
$fileContent = \file_get_contents(__DIR__ . '/../Localization/Defaults/Definitions/' . $file); $fileContent = \file_get_contents($file);
if ($fileContent === false) { if ($fileContent === false) {
break; break;