diff --git a/booking.admin.inc b/booking.admin.inc index af8d5da..1da37d9 100644 --- a/booking.admin.inc +++ b/booking.admin.inc @@ -739,8 +739,8 @@ function booking_admin() { '#title' => t('Leader/Helper Pair Format'), '#default_value' => variable_get('booking_studygroup_leaderhelperpair_text', '[meta-booking:studygroup-role] for [meta-booking:studygroup-descrip]. ' . - 'Your [meta-booking:studygroup-otherrole] is [meta-booking:studygroup-othername]. ' . - 'You can contact them on [meta-booking:studygroup-otherphone] or [meta-booking:studygroup-otheremail].' + 'Your [meta-booking:studygroup-otherrole] is [meta-booking:studygroup-othername]. ' . + 'You can contact them on [meta-booking:studygroup-otherphone] or [meta-booking:studygroup-otheremail].' ), '#description' => 'List element definition (using tokens) for token [booking:leaderhelper-pair], which is the study group leader/helper pair information in emails. ' . 'Note: Don\'t add the li tags, they will be added automatically.', diff --git a/booking.helper.inc b/booking.helper.inc index 09021db..426b3c8 100644 --- a/booking.helper.inc +++ b/booking.helper.inc @@ -1643,22 +1643,6 @@ function _booking_studygroup_email_summary($node) { // Make sure there is only HTML in the admin-entered text $list_element_text = check_markup($list_element_text, 'full_html', '', FALSE); $rows[] = token_replace($list_element_text, $tokens); - /* - // Add some boldness if we're using html email - if(variable_get('booking_enable_html_mail', 0) == 1) { - $rows[] = t('!role for group !descrip, which will occur on !weekday. !explan', array( - '!descrip' => $studygroup->booking_studygroup_descrip, '!weekday' => $studygroup->booking_studygroup_weekday, - '!explan' => $studygroup->booking_studygroup_explanation, '!role' => _booking_studygroup_role_lookup($node->$roleid), - )); - } - // Otherwise just leave things plain - else { - $rows[] = t('!role for group !descrip, which will occur on !weekday. !explan', array( - '!descrip' => $studygroup->booking_studygroup_descrip, '!weekday' => $studygroup->booking_studygroup_weekday, - '!explan' => $studygroup->booking_studygroup_explanation, '!role' => _booking_studygroup_role_lookup($node->$roleid), - )); - } - */ } // End checking for empty studygroup session } // End foreach loop @@ -1758,17 +1742,12 @@ function _booking_leader_helper_email_summary($node) { $list_element_text = variable_get('booking_studygroup_leaderhelperpair_text', '[meta-booking:studygroup-role] for [meta-booking:studygroup-descrip]. ' . - 'Your [meta-booking:studygroup-otherrole] is [meta-booking:studygroup-othername]. ' . - 'You can contact them on [meta-booking:studygroup-otherphone] or [meta-booking:studygroup-otheremail].' + 'Your [meta-booking:studygroup-otherrole] is [meta-booking:studygroup-othername]. ' . + 'You can contact them on [meta-booking:studygroup-otherphone] or [meta-booking:studygroup-otheremail].' ); // Make sure there is only HTML in the admin-entered text $list_element_text = check_markup($list_element_text, 'full_html', '', FALSE); $rows[] = token_replace($list_element_text, $tokens); - - //$rows[] = t('
  • !role for !descrip. Your !otherrole is !other. You can contact them on !phone or !email.
  • ', - // array('!role' => $role, '!id' => $studygroup->sid, '!descrip' => $studygroup->booking_studygroup_descrip, - // '!otherrole' => $otherrole, '!other' => $otherperson_name, '!phone' => $otherperson_phone, '!email' => $otherperson_email, - //)); } } }