diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-26 15:39:25 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-26 15:39:25 -0800 |
| commit | 9c71b74d373001ac47add095fc204bddb25ee91d (patch) | |
| tree | 70422b830b0e97cba30d503f3648e6b189e9b253 /mod | |
| parent | 535a54040f84bee6c90a24920cf861c2c307dfa4 (diff) | |
| parent | 68030d12cfefa8982774cca9714b0c1eed7b9537 (diff) | |
| download | volse-hubzilla-9c71b74d373001ac47add095fc204bddb25ee91d.tar.gz volse-hubzilla-9c71b74d373001ac47add095fc204bddb25ee91d.tar.bz2 volse-hubzilla-9c71b74d373001ac47add095fc204bddb25ee91d.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/new_channel.php | 1 | ||||
| -rw-r--r-- | mod/ping.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mod/new_channel.php b/mod/new_channel.php index 07b6cfc85..630984bf2 100644 --- a/mod/new_channel.php +++ b/mod/new_channel.php @@ -133,6 +133,7 @@ function new_channel_content(&$a) { '$label_name' => t('Channel Name'), '$help_name' => t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group" '), '$label_nick' => t('Choose a short nickname'), + '$nick_hub' => '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')), '$nick_desc' => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'), '$label_import' => t('Or <a href="import">import an existing channel</a> from another location'), '$name' => $name, diff --git a/mod/ping.php b/mod/ping.php index 394dbf089..69d504da1 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -299,7 +299,7 @@ function ping_init(&$a) { if($r) { foreach($r as $rr) { $result[] = array( - 'notify_link' => $a->get_baseurl() . '/connedit/' . $rr['abook_id'], + 'notify_link' => $a->get_baseurl() . '/connections/ifpending', 'name' => $rr['xchan_name'], 'url' => $rr['xchan_url'], 'photo' => $rr['xchan_photo_s'], |