diff --git a/boot.php b/boot.php index af3cc2494f..8a921473c7 100644 --- a/boot.php +++ b/boot.php @@ -1358,7 +1358,7 @@ if(! function_exists('profile_sidebar')) { '$pdesc' => $pdesc, '$marital' => $marital, '$homepage' => $homepage, - '$diaspora_info' => $diaspora, + '$diaspora' => $diaspora, '$contact_block' => $contact_block, )); diff --git a/include/conversation.php b/include/conversation.php index a5a6a992ff..1f416f352c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -703,6 +703,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $o = replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), '$live_update' => $live_update_div, + '$remove' => t('remove'), '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, diff --git a/mod/message.php b/mod/message.php index 26275ceab7..057797ddda 100644 --- a/mod/message.php +++ b/mod/message.php @@ -282,25 +282,23 @@ function message_content(&$a) { $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( - '$reply' => array( - 'header' => t('Send Private Message'), - 'to' => t('To:'), - 'showinputs' => 'true', - 'prefill' => $prefill, - 'autocomp' => $autocomp, - 'preid' => $preid, - 'subject' => t('Subject:'), - 'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), - 'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), - 'readonly' => '', - 'yourmessage' => t('Your message:'), - 'select' => $select, - 'parent' => '', - 'upload' => t('Upload photo'), - 'insert' => t('Insert web link'), - 'wait' => t('Please wait'), - 'submit' => t('Submit') - ) + '$header' => t('Send Private Message'), + '$to' => t('To:'), + '$showinputs' => 'true', + '$prefill' => $prefill, + '$autocomp' => $autocomp, + '$preid' => $preid, + '$subject' => t('Subject:'), + '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), + '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), + '$readonly' => '', + '$yourmessage' => t('Your message:'), + '$select' => $select, + '$parent' => '', + '$upload' => t('Upload photo'), + '$insert' => t('Insert web link'), + '$wait' => t('Please wait'), + '$submit' => t('Submit') )); return $o; @@ -514,22 +512,20 @@ function message_content(&$a) { '$mails' => $mails, // reply - '$reply_info' => array( - 'header' => t('Send Reply'), - 'to' => t('To:'), - 'showinputs' => '', - 'subject' => t('Subject:'), - 'subjtxt' => $subjtxt_e, - 'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', - 'yourmessage' => t('Your message:'), - 'text' => '', - 'select' => $select, - 'parent' => $parent, - 'upload' => t('Upload photo'), - 'insert' => t('Insert web link'), - 'submit' => t('Submit'), - 'wait' => t('Please wait'), - ), + '$header' => t('Send Reply'), + '$to' => t('To:'), + '$showinputs' => '', + '$subject' => t('Subject:'), + '$subjtxt' => template_escape($message['title']), + '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', + '$yourmessage' => t('Your message:'), + '$text' => '', + '$select' => $select, + '$parent' => $parent, + '$upload' => t('Upload photo'), + '$insert' => t('Insert web link'), + '$submit' => t('Submit'), + '$wait' => t('Please wait') )); diff --git a/mod/notifications.php b/mod/notifications.php index 128317eb47..9c14737f7f 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -218,7 +218,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl, array( '$notif_header' => t('Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); @@ -304,7 +304,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl, array( '$notif_header' => t('Network Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); @@ -334,7 +334,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl, array( '$notif_header' => t('System Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); @@ -429,7 +429,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl, array( '$notif_header' => t('Personal Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); @@ -510,7 +510,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl, array( '$notif_header' => t('Home Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); } diff --git a/mod/notify.php b/mod/notify.php index 6ff437a38c..b4d60a747c 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -63,7 +63,7 @@ function notify_content(&$a) { $o .= replace_macros($notif_tpl, array( '$notif_header' => t('System Notifications'), - '$tabs_data' => '', // $tabs, + '$tabs' => '', // $tabs, '$notif_content' => $notif_content, )); diff --git a/object/Item.php b/object/Item.php index 4da5b8a59f..eef8a50581 100644 --- a/object/Item.php +++ b/object/Item.php @@ -285,7 +285,6 @@ class Item extends BaseObject { 'comment' => $this->get_comment_box($indent), 'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'wait' => t('Please wait'), - 'remove' => t('remove'), 'thread_level' => $thread_level ); diff --git a/view/mail_display.tpl b/view/mail_display.tpl index bc3cd5b799..396aa46c0a 100644 --- a/view/mail_display.tpl +++ b/view/mail_display.tpl @@ -4,7 +4,7 @@ {{ endfor }} {{ if $canreply }} -{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }} +{{ inc prv_message.tpl }}{{ endinc }} {{ else }} $unknown_text {{endif }} diff --git a/view/notifications.tpl b/view/notifications.tpl index d6ce0cdd96..1a13b68b90 100644 --- a/view/notifications.tpl +++ b/view/notifications.tpl @@ -1,7 +1,7 @@

$notif_header

-{{ inc common_tabs.tpl with $tabs=$tabs_data }}{{ endinc }} +{{ inc common_tabs.tpl }}{{ endinc }}
$notif_content diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index cf3d73a544..d1e6847951 100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -31,7 +31,7 @@ {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }} + {{ inc diaspora_vcard.tpl }}{{ endinc }}