Merge pull request corowne#1081 from SpeedyD/release-merge-to-dev

Release merge to dev
ScuffedNewt · Oct 6, 2024 · 8128485 · 8128485
2 parents 722316f + 4d4b14b
commit 8128485
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php
@@ -1161,7 +1161,7 @@ public function updateCharacterStats($data, $character, $user) {
                     $old['number'] = $character->number;
                     $new['number'] = $characterData['number'];
                 }
-                if ($characterData['slug'] != $character->number) {
+                if ($characterData['slug'] != $character->slug) {
                     $result[] = 'character code';
                     $old['slug'] = $character->slug;
                     $new['slug'] = $characterData['slug'];

diff --git a/app/Services/TradeManager.php b/app/Services/TradeManager.php
@@ -691,7 +691,7 @@ private function creditAttachments($trade, $data = []) {
                         if (!$currency) {
                             throw new \Exception('Cannot credit an invalid currency. ('.$currencyId.')');
                         }
-                        if (!$currencyManager->creditCurrency($trade->{$type}, $trade->{$recipientType}, 'Trade', 'Received in trade [<a href="'.$trade->url.'">#'.$trade->id.']', $currency, $quantity)) {
+                        if (!$currencyManager->creditCurrency($trade->{$type}, $trade->{$recipientType}, 'Trade', 'Received in trade [<a href="'.$trade->url.'">#'.$trade->id.'</a>]', $currency, $quantity)) {
                             throw new \Exception('Could not credit currency. ('.$currencyId.')');
                         }
                     }