Merge pull request #157 from tobiasd/master

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index a8d81f1f6bb1360dfa548bea16cc284fbc648425..5fceebd4bd87c006e2e5afeb60f7cfdb5c3d1379 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -201,7 +201,7 @@ function register_post(&$a) {
        $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
                `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` )
                VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
-               dbesc(generate_guid()),
+               dbesc(generate_user_guid()),
                dbesc($username),
                dbesc($new_password_encoded),
                dbesc($email),
@@ -501,7 +501,7 @@ function register_content(&$a) {
        }
 
 
-       $license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.');
+       $license = cc_license();
 
 
        $o = get_markup_template("register.tpl");