Merge pull request #9333 from turbo124/v5-stable

v5.8.30
invoiceninja · Feb 24, 2024 · 1fc57b1 · 1fc57b1
2 parents bddf287 + be12394
commit 1fc57b1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-5.8.29
+5.8.30
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
@@ -164,7 +164,7 @@ public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
-        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col, Schema::getColumnListing('payments'))) {
+        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], Schema::getColumnListing('payments'))) {
             return $this->builder;
         }
 

diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php
@@ -50,7 +50,7 @@ public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
-        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col, \Illuminate\Support\Facades\Schema::getColumnListing('users'))) {
+        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], \Illuminate\Support\Facades\Schema::getColumnListing('users'))) {
             return $this->builder;
         }
 

diff --git a/config/ninja.php b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.8.29'),
-    'app_tag' => env('APP_TAG', '5.8.29'),
+    'app_version' => env('APP_VERSION', '5.8.30'),
+    'app_tag' => env('APP_TAG', '5.8.30'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),