Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 22:17:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8633 from turbo124/v5-stable

Browse Source 
v5.6.17
This commit is contained in:
David Bomba 2023-07-09 17:37:46 +10:00 committed by GitHub
commit 47fe251804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.6.16 5.6.17

2
app/Http/Middleware/Cors.php
View File

@ -15,7 +15,7 @@ class Cors
// ALLOW OPTIONS METHOD // ALLOW OPTIONS METHOD
$headers = [ $headers = [
'Access-Control-Allow-Methods'=> 'POST, GET, OPTIONS, PUT, DELETE', 'Access-Control-Allow-Methods'=> 'POST, GET, OPTIONS, PUT, DELETE',
'Access-Control-Allow-Headers'=> 'X-React,X-API-PASSWORD-BASE64,X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Disposition,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE', 'Access-Control-Allow-Headers'=> 'X-CLIENT-PLATFORM,X-React,X-API-PASSWORD-BASE64,X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Disposition,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE',
]; ];
return Response::make('OK', 200, $headers); return Response::make('OK', 200, $headers);

36
app/Utils/Traits/MakesInvoiceHtml.php
View File

@ -44,29 +44,29 @@ trait MakesInvoiceHtml
return Blade::render($string, $data); //potential fix for removing eval() return Blade::render($string, $data); //potential fix for removing eval()
$php = Blade::compileString($string); // $php = Blade::compileString($string);
$obLevel = ob_get_level(); // $obLevel = ob_get_level();
ob_start(); // ob_start();
extract($data, EXTR_SKIP); // extract($data, EXTR_SKIP);
try { // try {
eval('?'.'>'.$php); // eval('?'.'>'.$php);
} catch (Exception $e) { // } catch (Exception $e) {
while (ob_get_level() > $obLevel) { // while (ob_get_level() > $obLevel) {
ob_end_clean(); // ob_end_clean();
} // }
throw $e; // throw $e;
} catch (Throwable $e) { // } catch (Throwable $e) {
while (ob_get_level() > $obLevel) { // while (ob_get_level() > $obLevel) {
ob_end_clean(); // ob_end_clean();
} // }
throw new \Exception($e->getMessage()); // throw new \Exception($e->getMessage());
} // }
return ob_get_clean(); // return ob_get_clean();
} }
/* /*

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.6.16'), 'app_version' => env('APP_VERSION','5.6.17'),
'app_tag' => env('APP_TAG','5.6.16'), 'app_tag' => env('APP_TAG','5.6.17'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),