diff options
| -rw-r--r-- | mod/intro.php | 10 | ||||
| -rw-r--r-- | mod/new_channel.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/mod/intro.php b/mod/intro.php index 4b9d63629..dd98a6c7b 100644 --- a/mod/intro.php +++ b/mod/intro.php @@ -31,6 +31,12 @@ function intro_post(&$a) { } +function intro_aside(&$a) { + require_once('include/contact_widgets.php'); + + $a->set_widget('follow', follow_widget()); + +} function intro_content(&$a) { @@ -54,12 +60,12 @@ function intro_content(&$a) { $a->set_pager_total($r[0]['total']); if(! intval($r[0]['total'])) { notice( t('No pending introductions.') . EOL); - return; + return $o; } } else { notice( t('System error. Please try again later.') . EOL); - return; + return $o; } $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) LIMIT %d, %d", diff --git a/mod/new_channel.php b/mod/new_channel.php index 4067d84d3..8d0776ff0 100644 --- a/mod/new_channel.php +++ b/mod/new_channel.php @@ -110,7 +110,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_desc' => t('Your nickname will be used to create an easily remembered web address ("webbie") for your channel.'), + '$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('Check this box to import an existing channel file from another location'), '$name' => $name, '$nickname' => $nickname, diff --git a/mod/settings.php b/mod/settings.php index ef52388e2..99de364b7 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -956,7 +956,7 @@ function settings_content(&$a) { $tpl_addr = get_markup_template("settings_nick_set.tpl"); $prof_addr = replace_macros($tpl_addr,array( - '$desc' => t('Your channel address (or "webbie") is'), + '$desc' => t('Your channel address is'), '$nickname' => $nickname, '$subdir' => $subdir, '$basepath' => $a->get_hostname() |