use prepare_text instead of prepare_body

5 files changed, 48 insertions, 42 deletions

diff --git a/boot.php b/boot.php
index a97f85814..ed7c9956c 100644
--- a/boot.php
+++ b/boot.php
@@ -40,6 +40,8 @@ define ( 'REGISTER_OPEN',          2 );
 
 /**
  * relationship types
+ * When used in contact records, this indicates that 'uid' has 
+ * this relationship with contact['name']
  */
 
 define ( 'REL_VIP',        1);
@@ -2417,10 +2419,15 @@ function link_compare($a,$b) {
 
 if(! function_exists('prepare_body')) {
 function prepare_body($item) {
+	return prepare_text($item['body']);
+}}
+
+if(! function_exists('prepare_text')) {
+function prepare_text($text) {
 
 	require_once('include/bbcode.php');
 
-	$s = smilies(bbcode($item['body']));
+	$s = smilies(bbcode($text));
 
 	return $s;
 }}
diff --git a/view/de/profile_advanced.php b/view/de/profile_advanced.php
index aec1b0108..ec6eb6e3a 100644
--- a/view/de/profile_advanced.php
+++ b/view/de/profile_advanced.php
@@ -113,7 +113,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">About:</div>
@@ -124,7 +124,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbies/Interests:</div>
@@ -135,7 +135,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
@@ -146,7 +146,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Musical interests:</div>
@@ -157,7 +157,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Books, literature:</div>
@@ -168,7 +168,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Television:</div>
@@ -179,7 +179,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
@@ -190,7 +190,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Love/romance:</div>
@@ -201,7 +201,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Work/employment:</div>
@@ -212,7 +212,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">School/education:</div>
diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php
index aec1b0108..6d2ecba4d 100644
--- a/view/en/profile_advanced.php
+++ b/view/en/profile_advanced.php
@@ -112,8 +112,7 @@ $o .= <<< EOT
 <div id="advanced-profile-religion-end"></div>
 EOT;
 }
-
-if($txt = prepare_body($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">About:</div>
@@ -124,7 +123,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbies/Interests:</div>
@@ -135,7 +134,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
@@ -146,7 +145,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Musical interests:</div>
@@ -157,7 +156,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Books, literature:</div>
@@ -168,7 +167,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Television:</div>
@@ -179,7 +178,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
@@ -190,7 +189,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Love/romance:</div>
@@ -201,7 +200,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Work/employment:</div>
@@ -212,7 +211,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">School/education:</div>
diff --git a/view/fr/profile_advanced.php b/view/fr/profile_advanced.php
index c7f8834da..73f7f135e 100644
--- a/view/fr/profile_advanced.php
+++ b/view/fr/profile_advanced.php
@@ -113,7 +113,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">About:</div>
@@ -124,7 +124,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbies/Interests:</div>
@@ -135,7 +135,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
@@ -146,7 +146,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Musical interests:</div>
@@ -157,7 +157,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Books, literature:</div>
@@ -168,7 +168,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Television:</div>
@@ -179,7 +179,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
@@ -190,7 +190,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Love/romance:</div>
@@ -201,7 +201,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Work/employment:</div>
@@ -212,7 +212,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">School/education:</div>
diff --git a/view/it/profile_advanced.php b/view/it/profile_advanced.php
index ee6d8b50d..fe065d46f 100644
--- a/view/it/profile_advanced.php
+++ b/view/it/profile_advanced.php
@@ -113,7 +113,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">Informazioni varie:</div>
@@ -124,7 +124,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbie/Interessi:</div>
@@ -135,7 +135,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Informazioni su contatti e Social Networks:</div>
@@ -146,7 +146,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Interessi musicali:</div>
@@ -157,7 +157,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Libri, letteratura:</div>
@@ -168,7 +168,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Televisione:</div>
@@ -179,7 +179,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/danza/cultura/intrattenimento:</div>
@@ -190,7 +190,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Amore/romanticismo:</div>
@@ -201,7 +201,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Lavoro/impiego:</div>
@@ -212,7 +212,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = prepare_body($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">Scuola/educazione:</div>