diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-05 15:35:05 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-05 15:35:05 -0700 |
| commit | fca8e0aa6ac9d4f2084371486e906d7e3726a5a5 (patch) | |
| tree | 81d27ea002828a42c53541f741bad44684a2c601 /Zotlabs/Module/Settings | |
| parent | 41111bcdadcd16ebc4f078fc812eb5a290f185e5 (diff) | |
| parent | 8dd9ab05a97f92f9eca5d527e48272f3a44010a8 (diff) | |
| download | volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.tar.gz volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.tar.bz2 volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Settings')
| -rw-r--r-- | Zotlabs/Module/Settings/Account.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Settings/Account.php b/Zotlabs/Module/Settings/Account.php index ec176797d..18890e89f 100644 --- a/Zotlabs/Module/Settings/Account.php +++ b/Zotlabs/Module/Settings/Account.php @@ -16,7 +16,7 @@ class Account { $account = \App::get_account(); if($email != $account['account_email']) { - if(! valid_email($email)) + if(! validate_email($email)) $errs[] = t('Not valid email.'); $adm = trim(get_config('system','admin_email')); if(($adm) && (strcasecmp($email,$adm) == 0)) { diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 12ad25d51..3e6adcf8d 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -489,7 +489,6 @@ class Channel { '$h_prv' => t('Security and Privacy Settings'), '$permissions_set' => $permissions_set, - '$server_role' => \Zotlabs\Lib\System::get_server_role(), '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'), '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no), |