Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 17:34:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2016-07-14 22:59:53 +03:00
commit 6d7b25bcf5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -26,3 +26,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- "Manual entry" untranslatable #562 - "Manual entry" untranslatable #562
- Using a database table prefix breaks the dashboard #203 - Using a database table prefix breaks the dashboard #203
- Request statically called in StartupCheck.php #977

6
app/Http/Middleware/StartupCheck.php
View File

@ -33,12 +33,12 @@ class StartupCheck
// TRUSTED_PROXIES accepts a comma delimited list of subnets // TRUSTED_PROXIES accepts a comma delimited list of subnets
// ie, TRUSTED_PROXIES='10.0.0.0/8,172.16.0.0/12,192.168.0.0/16' // ie, TRUSTED_PROXIES='10.0.0.0/8,172.16.0.0/12,192.168.0.0/16'
if (isset($_ENV['TRUSTED_PROXIES'])) { if (isset($_ENV['TRUSTED_PROXIES'])) {
Request::setTrustedProxies(array_map('trim', explode(',', env('TRUSTED_PROXIES')))); $request->setTrustedProxies(array_map('trim', explode(',', env('TRUSTED_PROXIES'))));
} }
// Ensure all request are over HTTPS in production // Ensure all request are over HTTPS in production
if (Utils::requireHTTPS() && !Request::secure()) { if (Utils::requireHTTPS() && !$request->secure()) {
return Redirect::secure(Request::path()); return Redirect::secure($request->path());
} }
// If the database doens't yet exist we'll skip the rest // If the database doens't yet exist we'll skip the rest