From 443c2193d5c2387eeeb81f8d8f41731e5a9b947c Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 10 Nov 2017 12:21:27 +0200 Subject: [PATCH] Installation on 3.8.1 fails: Exception AccountRepository.php #1738 --- app/Ninja/Repositories/AccountRepository.php | 42 ++++++++++---------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php index 2b50361603..1ae0f807d9 100644 --- a/app/Ninja/Repositories/AccountRepository.php +++ b/app/Ninja/Repositories/AccountRepository.php @@ -59,29 +59,31 @@ class AccountRepository $account->company_id = $company->id; // Set default language/currency based on IP - $data = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $account->ip)); - $currencyCode = strtolower($data['geoplugin_currencyCode']); - $countryCode = strtolower($data['geoplugin_countryCode']); + if (\Cache::get('currencies')) { + $data = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $account->ip)); + $currencyCode = strtolower($data['geoplugin_currencyCode']); + $countryCode = strtolower($data['geoplugin_countryCode']); - $currency = \Cache::get('currencies')->filter(function ($item) use ($currencyCode) { - return strtolower($item->code) == $currencyCode; - })->first(); - if ($currency) { - $account->currency_id = $currency->id; - } + $currency = \Cache::get('currencies')->filter(function ($item) use ($currencyCode) { + return strtolower($item->code) == $currencyCode; + })->first(); + if ($currency) { + $account->currency_id = $currency->id; + } - $country = \Cache::get('countries')->filter(function ($item) use ($countryCode) { - return strtolower($item->iso_3166_2) == $countryCode || strtolower($item->iso_3166_3) == $countryCode; - })->first(); - if ($country) { - $account->country_id = $country->id; - } + $country = \Cache::get('countries')->filter(function ($item) use ($countryCode) { + return strtolower($item->iso_3166_2) == $countryCode || strtolower($item->iso_3166_3) == $countryCode; + })->first(); + if ($country) { + $account->country_id = $country->id; + } - $language = \Cache::get('languages')->filter(function ($item) use ($countryCode) { - return strtolower($item->locale) == $countryCode; - })->first(); - if ($language) { - $account->language_id = $language->id; + $language = \Cache::get('languages')->filter(function ($item) use ($countryCode) { + return strtolower($item->locale) == $countryCode; + })->first(); + if ($language) { + $account->language_id = $language->id; + } } $account->save();