call zidify_links() when formatting bbcode for internal consumption

5 files changed, 12 insertions, 12 deletions

diff --git a/include/channel.php b/include/channel.php
index 4fc873402..caf3ded71 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1218,7 +1218,7 @@ function advanced_profile(&$a) {
 			$profile['marital'] = array( t('Status:'), App::$profile['marital']);
 
 		if(App::$profile['partner'])
-			$profile['marital']['partner'] = bbcode(App::$profile['partner']);
+			$profile['marital']['partner'] = zidify_links(bbcode(App::$profile['partner']));
 
 		if(strlen(App::$profile['howlong']) && App::$profile['howlong'] > NULL_DATE) {
 			$profile['howlong'] = relative_date(App::$profile['howlong'], t('for %1$d %2$s'));
diff --git a/include/conversation.php b/include/conversation.php
index af64fbb90..1673bc9fb 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1564,7 +1564,7 @@ function format_location($item) {
 
 	if(strpos($item['location'],'#') === 0) {
 		$location = substr($item['location'],1);
-		$location = ((strpos($location,'[') !== false) ? bbcode($location) : $location);
+		$location = ((strpos($location,'[') !== false) ? zidify_links(bbcode($location)) : $location);
 	}
 	else {
 		$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
@@ -1616,7 +1616,7 @@ function prepare_page($item) {
 		'$author' => (($naked) ? '' : $item['author']['xchan_name']),
 		'$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])),
 		'$date' => (($naked) ? '' : datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'Y-m-d H:i')),
-		'$title' => smilies(bbcode($item['title'])),
+		'$title' => zidify_links(smilies(bbcode($item['title']))),
 		'$body' => $body['html'],
 		'$preview' => $preview,
 		'$link' => $link,
diff --git a/include/event.php b/include/event.php
index cbee2b759..8fb060a40 100644
--- a/include/event.php
+++ b/include/event.php
@@ -25,7 +25,7 @@ function format_event_html($ev) {
 
 	$o = '<div class="vevent">' . "\r\n";
 
-	$o .= '<div class="event-title"><h3><i class="fa fa-calendar"></i>&nbsp;' . bbcode($ev['summary']) .  '</h3></div>' . "\r\n";
+	$o .= '<div class="event-title"><h3><i class="fa fa-calendar"></i>&nbsp;' . zidify_links(smilies(bbcode($ev['summary']))) .  '</h3></div>' . "\r\n";
 
 	$o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
 		. datetime_convert('UTC', 'UTC', $ev['dtstart'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
@@ -46,11 +46,11 @@ function format_event_html($ev) {
 				$ev['dtend'] , $bd_format )))
 			. '</span></div>'  . "\r\n";
 
-	$o .= '<div class="event-description">' . bbcode($ev['description']) .  '</div>' . "\r\n";
+	$o .= '<div class="event-description">' . zidify_links(smilies(bbcode($ev['description']))) .  '</div>' . "\r\n";
 
 	if(strlen($ev['location']))
 		$o .= '<div class="event-location"><span class="event-label"> ' . t('Location:') . '</span>&nbsp;<span class="location">' 
-			. bbcode($ev['location'])
+			. zidify_links(smilies(bbcode($ev['location'])))
 			. '</span></div>' . "\r\n";
 
 	$o .= '</div>' . "\r\n";
@@ -69,7 +69,7 @@ function format_event_obj($jobject) {
 		$bd_format = t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8:01 AM
 
 		$event['header'] = replace_macros(get_markup_template('event_item_header.tpl'),array(
-			'$title'	 => bbcode($object['title']),
+			'$title'	 => zidify_links(smilies(bbcode($object['title']))),
 			'$dtstart_label' => t('Starts:'),
 			'$dtstart_title' => datetime_convert('UTC', 'UTC', $object['dtstart'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )),
 			'$dtstart_dt'	 => (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $object['dtstart'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $object['dtstart'] , $bd_format))),
@@ -80,9 +80,9 @@ function format_event_obj($jobject) {
 		));
 
 		$event['content'] = replace_macros(get_markup_template('event_item_content.tpl'),array(
-			'$description'	  => bbcode($object['description']),
+			'$description'	  => zidify_links(smilies(bbcode($object['description']))),
 			'$location_label' => t('Location:'),
-			'$location'	  => bbcode($object['location'])
+			'$location'	  => zidify_links(smilies(bbcode($object['location'])))
 		));
 
 	}
diff --git a/include/help.php b/include/help.php
index 03d01d1a1..6e779f000 100644
--- a/include/help.php
+++ b/include/help.php
@@ -79,7 +79,7 @@ function get_help_content($tocpath = false) {
 	}
 	if($doctype === 'bbcode') {
 		require_once('include/bbcode.php');
-		$content = bbcode($text);
+		$content = zidify_links(bbcode($text));
 		// bbcode retargets external content to new windows. This content is internal.
 		$content = str_replace(' target="_blank"', '', $content);
 	}
@@ -95,7 +95,7 @@ function preg_callback_help_include($matches) {
 		$include = str_replace($matches[0],load_doc_file($matches[1]),$matches[0]);
 		if(preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) {
 			require_once('include/bbcode.php');
-			$include = bbcode($include);
+			$include = zidify_links(bbcode($include));
 			$include = str_replace(' target="_blank"','',$include);
 		}
 		elseif(preg_match('/\.md$/', $matches[1])) {
diff --git a/include/menu.php b/include/menu.php
index b54ff7f9e..4add78c39 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -102,7 +102,7 @@ function menu_render($menu, $class='', $edit = false, $var = array()) {
 		if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN)
 			$menu['items'][$x]['newwin'] = '1';
 
-		$menu['items'][$x]['mitem_desc'] = bbcode($menu['items'][$x]['mitem_desc']);
+		$menu['items'][$x]['mitem_desc'] = zidify_links(smilies(bbcode($menu['items'][$x]['mitem_desc'])));
 	}
 
 	$wrap = (($var['wrap'] === 'none') ? false : true);