aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Register.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-28 11:09:22 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-28 11:09:22 +0200
commit9f576369a97009bc93f4f724f85024410c3899df (patch)
treeadc2c68e8729ff783eca9cd259bc5b8fe394d2e6 /Zotlabs/Module/Register.php
parent911510f9996dc43bd3440884325326b7e99ea12f (diff)
parent7d7f43c2056fd50ff26aed5df553bf4936ead196 (diff)
downloadvolse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.tar.gz
volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.tar.bz2
volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Register.php')
-rw-r--r--Zotlabs/Module/Register.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index 7cd1ee501..6afa4a94c 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -259,7 +259,8 @@ class Register extends \Zotlabs\Web\Controller {
'$email' => $email,
'$pass1' => $password,
'$pass2' => $password2,
- '$submit' => ((UNO || $auto_create || $registration_is) ? t('Register') : t('Proceed to create your first channel'))
+ '$submit' => t('Register'),
+ '$verify_note' => t('This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions.')
));
return $o;