diff options
| author | M. Dent <dentm42@gmail.com> | 2019-03-24 03:20:24 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-03-24 03:20:24 +0100 |
| commit | 9ebf6bcc92acb03fbdc237e8e44f5391586b42cb (patch) | |
| tree | faf130b5332c30cb5b9acbee0bf2fdf1225641e6 /Zotlabs/Module/Changeaddr.php | |
| parent | 9b696a872bf8712875dc0851b1873ec3353591be (diff) | |
| parent | 9d186e9ba3bdb206f4f85eed8662c1c87054fbdf (diff) | |
| download | volse-hubzilla-9ebf6bcc92acb03fbdc237e8e44f5391586b42cb.tar.gz volse-hubzilla-9ebf6bcc92acb03fbdc237e8e44f5391586b42cb.tar.bz2 volse-hubzilla-9ebf6bcc92acb03fbdc237e8e44f5391586b42cb.zip | |
Merge branch 'core_fixes' into 'dev'
Core fixes
See merge request hubzilla/core!1569
Diffstat (limited to 'Zotlabs/Module/Changeaddr.php')
| -rw-r--r-- | Zotlabs/Module/Changeaddr.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Changeaddr.php b/Zotlabs/Module/Changeaddr.php index 5cd236394..ed139c9f9 100644 --- a/Zotlabs/Module/Changeaddr.php +++ b/Zotlabs/Module/Changeaddr.php @@ -31,7 +31,7 @@ class Changeaddr extends \Zotlabs\Web\Controller { if($account['account_password_changed'] > NULL_DATE) { $d1 = datetime_convert('UTC','UTC','now - 48 hours'); - if($account['account_password_changed'] > d1) { + if($account['account_password_changed'] > $d1) { notice( t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL); return; } @@ -49,7 +49,7 @@ class Changeaddr extends \Zotlabs\Web\Controller { if(check_webbie(array($new_address)) !== $new_address) { notice( t('Nickname has unsupported characters or is already being used on this site.') . EOL); - return $ret; + return; } channel_change_address($channel,$new_address); |