Stuff ...

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index bf29daf1a649e371418b08487f018187aa7efab1..f8b1578ceb188d0ed3050c3c581baf809c70fb88 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -189,8 +189,8 @@ function create_user($arr) {
        $spubkey = $sres['pubkey'];
 
        $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
-               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class` )
-               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s' )",
+               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class`, `default-location` )
+               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s', '' )",
                dbesc(generate_user_guid()),
                dbesc($username),
                dbesc($new_password_encoded),
@@ -382,7 +382,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
                The login details are as follows:
                        Site Location:  %3$s
                        Login Name:     %1$s
-                       Password:       %5$
+                       Password:       %5$s
 
                You may change your password from your account "Settings" page after logging
                in.
@@ -407,7 +407,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
                $preamble = sprintf($preamble, $username, $sitename);
                $body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
-               notification(array(
+               return notification(array(
                        'type' => "SYSTEM_EMAIL",
                        'to_email' => $email,
                        'subject'=> sprintf( t('Registration details for %s'), $sitename),