kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix some reported issues.

Browse Source
This commit is contained in:
James Cole
2016-10-22 09:44:47 +02:00
parent 5d9b68c3e7
commit 091f6e918b
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Admin/UserController.php
View File

@@ -92,16 +92,16 @@ class UserController extends Controller
$subTitleIcon = 'fa-user';
// get IP info:
$defaultIp = '0.0.0.0';
$registrationPreference = Preferences::getForUser($user, 'registration_ip_address');
$registration = $defaultIp;
$confirmationPreference = Preferences::getForUser($user, 'confirmation_ip_address');
$confirmation = $defaultIp;
if (!is_null($registrationPreference)) {
$registration = $registrationPreference->data;
$defaultIp = '0.0.0.0';
$regPref = Preferences::getForUser($user, 'registration_ip_address');
$registration = $defaultIp;
$conPref = Preferences::getForUser($user, 'confirmation_ip_address');
$confirmation = $defaultIp;
if (!is_null($regPref)) {
$registration = $regPref->data;
}
if (!is_null($confirmationPreference)) {
$confirmation = $confirmationPreference->data;
if (!is_null($conPref)) {
$confirmation = $conPref->data;
}
$registrationHost = '';