Merge pull request #1310 from tobiasd/20150124admin

type email for email field in add user form

diff --git a/mod/admin.php b/mod/admin.php
index 8bddd8ce88ae6c492a2b87bcef95c28e74169f8e..bf74d3ef3c64f67853ba54de37de80a9f06e8920 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1000,7 +1000,7 @@ function admin_page_users(&$a){
                '$users' => $users,
                '$newusername'  => array('new_user_name', t("Name"), '', t("Name of the new user.")),
                '$newusernickname'  => array('new_user_nickname', t("Nickname"), '', t("Nickname of the new user.")),
-               '$newuseremail'  => array('new_user_email', t("Email"), '', t("Email address of the new user.")),
+               '$newuseremail'  => array('new_user_email', t("Email"), '', t("Email address of the new user."), '', '', 'email'),
        ));
        $o .= paginate($a);
        return $o;

diff --git a/mod/settings.php b/mod/settings.php
index 4c64e4da63aab21439f69a7d9b2a8824d3609989..b01c4fabde7b2f3cc7714f21ce33ff2fbf26040c 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1126,7 +1126,7 @@ function settings_content(&$a) {
 
                '$h_basic'      => t('Basic Settings'),
                '$username' => array('username',  t('Full Name:'), $username,''),
-               '$email'        => array('email', t('Email Address:'), $email, ''),
+               '$email'        => array('email', t('Email Address:'), $email, '', '', '', 'email'),
                '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
                '$defloc'       => array('defloc', t('Default Post Location:'), $defloc, ''),
                '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),