2 Commits

Author SHA1 Message Date
Sarjuuk
ef981c93e2 DB/Fixup: database dump ddl dml inconsistency (#453, #452)
* fix: `db_structure.sql` dump missed DML change after `aowow_account.allowExpire` field removed (in `a99fff46`)
* fix: `db_structure.sql` dump missed DML change after `aowow_articles.quickInfo` field removed (in `112acb22`)

---------

Co-authored-by: Михаил Драгункин <contact@md.land>
2025-09-26 15:35:24 +02:00
Sarjuuk
10c70209e7 Markup/Fixup
* fix replacing tags with names
2025-09-25 19:23:39 +02:00
2 changed files with 5 additions and 5 deletions

View File

@@ -164,7 +164,7 @@ class Markup implements \JsonSerializable
for ($i = 0; $i < count($sm); $i += 2)
{
if (!empty($jsgData[Type::ITEM][1][$sm[$i]]))
$moneys[] = $jsgData[Type::ITEM][1][$sm[$i]]['name'];
$moneys[] = $jsgData[Type::ITEM][1][$sm[$i]]['name'] ?? $jsgData[Type::ITEM][1][$match[2]]['name_' . Lang::getLocale()->json()];
else
$moneys[] = Util::ucFirst(Lang::game('item')).' #'.$sm[$i];
}
@@ -179,7 +179,7 @@ class Markup implements \JsonSerializable
for ($i = 0; $i < count($sm); $i += 2)
{
if (!empty($jsgData[Type::CURRENCY][1][$sm[$i]]))
$moneys[] = $jsgData[Type::CURRENCY][1][$sm[$i]]['name'];
$moneys[] = $jsgData[Type::CURRENCY][1][$sm[$i]]['name'] ?? $jsgData[Type::CURRENCY][1][$match[2]]['name_' . Lang::getLocale()->json()];
else
$moneys[] = Util::ucFirst(Lang::game('curency')).' #'.$sm[$i];
}
@@ -191,7 +191,7 @@ class Markup implements \JsonSerializable
if ($type = Type::getIndexFrom(Type::IDX_FILE_STR, $match[1]))
{
if (!empty($jsgData[$type][1][$match[2]]))
return $jsgData[$type][1][$match[2]]['name'];
return $jsgData[$type][1][$match[2]]['name'] ?? $jsgData[$type][1][$match[2]]['name_' . Lang::getLocale()->json()];
else
return Util::ucFirst(Lang::game($match[1])).' #'.$match[2];
}

File diff suppressed because one or more lines are too long