diff --git a/boot.php b/boot.php index 6fe5ee99d6..cbbe55edc5 100644 --- a/boot.php +++ b/boot.php @@ -1497,7 +1497,7 @@ function validate_email($addr) { return false; $h = substr($addr,strpos($addr,'@') + 1); - if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) { + if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) { return true; } return false; diff --git a/mod/display.php b/mod/display.php index fd845e608e..30b55decea 100644 --- a/mod/display.php +++ b/mod/display.php @@ -243,6 +243,7 @@ function display_content(&$a) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], + '$title' => t('View $name's profile'), '$profile_url' => $profile_link, '$name' => $profile_name, '$sparkle' => $sparkle, diff --git a/mod/network.php b/mod/network.php index ad6db2d1e1..e1bec8dfa6 100644 --- a/mod/network.php +++ b/mod/network.php @@ -286,6 +286,7 @@ function network_content(&$a, $update = 0) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], + '$title' => t('View $name's profile'), '$profile_url' => $profile_link, '$name' => $profile_name, '$thumb' => $profile_avatar, diff --git a/mod/profile.php b/mod/profile.php index cc0debd992..7a57bd5a42 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -344,6 +344,7 @@ function profile_content(&$a, $update = 0) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], + '$title' => t('View $name's profile'), '$profile_url' => $profile_link, '$name' => $profile_name, '$thumb' => $profile_avatar, diff --git a/util/strings.php b/util/strings.php index cf7299cde9..fa0e157173 100644 --- a/util/strings.php +++ b/util/strings.php @@ -139,6 +139,7 @@ $a->strings['Global Directory'] = 'Global Directory'; $a->strings['Item not found.'] = 'Item not found.'; $a->strings['Private Message'] = 'Private Message'; $a->strings['This is you'] = 'This is you'; +$a->strings['View $name's profile'] = 'View $name's profile'; $a->strings['Item has been removed.'] = 'Item has been removed.'; $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.'; $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.'; @@ -195,7 +196,6 @@ $a->strings['Unable to locate original post.'] = 'Unable to locate original post $a->strings['Empty post discarded.'] = 'Empty post discarded.'; $a->strings[" commented on your item at "] = " commented on your item at "; $a->strings[" posted on your profile wall at "] = " posted on your profile wall at "; -$a->strings['Facebook status update failed.'] = 'Facebook status update failed.'; $a->strings['photo'] = 'photo'; $a->strings['status'] = 'status'; $a->strings['likes'] = 'likes'; @@ -341,10 +341,10 @@ $a->strings['Select a tag to remove: '] = 'Select a tag to remove: '; $a->strings['Remove'] = 'Remove'; $a->strings['No contacts.'] = 'No contacts.'; $a->strings['Wall Photos'] = 'Wall Photos'; +$a->strings['Logged out.'] = 'Logged out.'; $a->strings['Visible To:'] = 'Visible To:'; $a->strings['Groups'] = 'Groups'; $a->strings['Except For:'] = 'Except For:'; -$a->strings['Logged out.'] = 'Logged out.'; $a->strings['Unknown | Not categorised'] = 'Unknown | Not categorised'; $a->strings['Block immediately'] = 'Block immediately'; $a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer'; diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 4d2404ce0b..67fce41526 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -1,13 +1,13 @@