diff --git a/mod/settings.php b/mod/settings.php index 861be7946..1abb60fcc 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -163,6 +163,8 @@ function settings_content(&$a) { $nickname_block = replace_macros($nickname_block,array( '$nickname' => $nickname, + '$uid' => $_SESSION['uid'], + '$basepath' => substr($a->get_baseurl(),strpos($a->get_baseurl(),'://') + 3), '$baseurl' => $a->get_baseurl())); $o = file_get_contents('view/settings.tpl'); diff --git a/view/profile.php b/view/profile.php index 54087404a..808e2dbaa 100644 --- a/view/profile.php +++ b/view/profile.php @@ -19,7 +19,9 @@
+Your profile URL is currently '$baseurl/profile/$uid'.
Setting a nickname will allow a friendly profile URL such as
-$baseurl/profile/nickname
-Once set, it can never be changed. Only letter, numbers, spaces and
-underscore are allowed and the nickname must start with a space.
+'nickname@$basepath'.
+
+Once set, it can never be changed. The nickname must start with a letter; and only letters, numbers, dashes, and underscores are allowed.