Merge branch 'character-private-families' of https://github.com/owlch…

…ester/kanka into character-private-families
owlchester · Jul 15, 2024 · 9e86037 · 9e86037
2 parents 8c0fce7 + 1fea872
commit 9e86037
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/Http/Controllers/Settings/SubscriptionController.php b/app/Http/Controllers/Settings/SubscriptionController.php
@@ -198,11 +198,11 @@ public function subscribe(UserSubscribeStore $request, Tier $tier)
                 return redirect()
                     ->route('settings.subscription')
                     ->with('error_raw', __('subscription.errors.invalid_currency', [
-                        'old' => strtoupper($currencies[1][0]),
-                        'new' => strtoupper($currencies[1][1]),
+                        'old' => mb_strtoupper($currencies[1][0]),
+                        'new' => mb_strtoupper($currencies[1][1]),
                         'email' => '<a href="mailto:' . config('app.email') . '">' . config('app.email') . '</a>'
                     ]))
-                    ;
+                ;
             }
             // Error? json
             return response()->json([

diff --git a/app/Policies/CampaignPolicy.php b/app/Policies/CampaignPolicy.php
@@ -205,7 +205,6 @@ public function members(?User $user, Campaign $campaign): bool
 
     /**
      * Permission to view the campaign submissions
-     * @return bool
      */
     public function submissions(?User $user): bool
     {
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * Permission to view the campaign submissions
-         * @return bool
          */
         public function submissions(?User $user): bool
         {
@@ Expand Down @@