diff --git a/boot.php b/boot.php index a97f858140..ed7c9956cf 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 aec1b01087..ec6eb6e3ae 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
About:
@@ -124,7 +124,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['interest'])) { +if($txt = prepare_text($a->profile['interest'])) { $o .= <<< EOT
Hobbies/Interests:
@@ -135,7 +135,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['contact'])) { +if($txt = prepare_text($a->profile['contact'])) { $o .= <<< EOT
Contact information and Social Networks:
@@ -146,7 +146,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['music'])) { +if($txt = prepare_text($a->profile['music'])) { $o .= <<< EOT
Musical interests:
@@ -157,7 +157,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['book'])) { +if($txt = prepare_text($a->profile['book'])) { $o .= <<< EOT
Books, literature:
@@ -168,7 +168,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['tv'])) { +if($txt = prepare_text($a->profile['tv'])) { $o .= <<< EOT
Television:
@@ -179,7 +179,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['film'])) { +if($txt = prepare_text($a->profile['film'])) { $o .= <<< EOT
Film/dance/culture/entertainment:
@@ -190,7 +190,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['romance'])) { +if($txt = prepare_text($a->profile['romance'])) { $o .= <<< EOT
Love/romance:
@@ -201,7 +201,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['work'])) { +if($txt = prepare_text($a->profile['work'])) { $o .= <<< EOT
Work/employment:
@@ -212,7 +212,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['education'])) { +if($txt = prepare_text($a->profile['education'])) { $o .= <<< EOT
School/education:
diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php index aec1b01087..6d2ecba4d6 100644 --- a/view/en/profile_advanced.php +++ b/view/en/profile_advanced.php @@ -112,8 +112,7 @@ $o .= <<< EOT
EOT; } - -if($txt = prepare_body($a->profile['about'])) { +if($txt = prepare_text($a->profile['about'])) { $o .= <<< EOT
About:
@@ -124,7 +123,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['interest'])) { +if($txt = prepare_text($a->profile['interest'])) { $o .= <<< EOT
Hobbies/Interests:
@@ -135,7 +134,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['contact'])) { +if($txt = prepare_text($a->profile['contact'])) { $o .= <<< EOT
Contact information and Social Networks:
@@ -146,7 +145,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['music'])) { +if($txt = prepare_text($a->profile['music'])) { $o .= <<< EOT
Musical interests:
@@ -157,7 +156,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['book'])) { +if($txt = prepare_text($a->profile['book'])) { $o .= <<< EOT
Books, literature:
@@ -168,7 +167,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['tv'])) { +if($txt = prepare_text($a->profile['tv'])) { $o .= <<< EOT
Television:
@@ -179,7 +178,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['film'])) { +if($txt = prepare_text($a->profile['film'])) { $o .= <<< EOT
Film/dance/culture/entertainment:
@@ -190,7 +189,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['romance'])) { +if($txt = prepare_text($a->profile['romance'])) { $o .= <<< EOT
Love/romance:
@@ -201,7 +200,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['work'])) { +if($txt = prepare_text($a->profile['work'])) { $o .= <<< EOT
Work/employment:
@@ -212,7 +211,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['education'])) { +if($txt = prepare_text($a->profile['education'])) { $o .= <<< EOT
School/education:
diff --git a/view/fr/profile_advanced.php b/view/fr/profile_advanced.php index c7f8834da4..73f7f135ef 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
About:
@@ -124,7 +124,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['interest'])) { +if($txt = prepare_text($a->profile['interest'])) { $o .= <<< EOT
Hobbies/Interests:
@@ -135,7 +135,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['contact'])) { +if($txt = prepare_text($a->profile['contact'])) { $o .= <<< EOT
Contact information and Social Networks:
@@ -146,7 +146,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['music'])) { +if($txt = prepare_text($a->profile['music'])) { $o .= <<< EOT
Musical interests:
@@ -157,7 +157,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['book'])) { +if($txt = prepare_text($a->profile['book'])) { $o .= <<< EOT
Books, literature:
@@ -168,7 +168,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['tv'])) { +if($txt = prepare_text($a->profile['tv'])) { $o .= <<< EOT
Television:
@@ -179,7 +179,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['film'])) { +if($txt = prepare_text($a->profile['film'])) { $o .= <<< EOT
Film/dance/culture/entertainment:
@@ -190,7 +190,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['romance'])) { +if($txt = prepare_text($a->profile['romance'])) { $o .= <<< EOT
Love/romance:
@@ -201,7 +201,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['work'])) { +if($txt = prepare_text($a->profile['work'])) { $o .= <<< EOT
Work/employment:
@@ -212,7 +212,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['education'])) { +if($txt = prepare_text($a->profile['education'])) { $o .= <<< EOT
School/education:
diff --git a/view/it/profile_advanced.php b/view/it/profile_advanced.php index ee6d8b50d4..fe065d46f8 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
Informazioni varie:
@@ -124,7 +124,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['interest'])) { +if($txt = prepare_text($a->profile['interest'])) { $o .= <<< EOT
Hobbie/Interessi:
@@ -135,7 +135,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['contact'])) { +if($txt = prepare_text($a->profile['contact'])) { $o .= <<< EOT
Informazioni su contatti e Social Networks:
@@ -146,7 +146,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['music'])) { +if($txt = prepare_text($a->profile['music'])) { $o .= <<< EOT
Interessi musicali:
@@ -157,7 +157,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['book'])) { +if($txt = prepare_text($a->profile['book'])) { $o .= <<< EOT
Libri, letteratura:
@@ -168,7 +168,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['tv'])) { +if($txt = prepare_text($a->profile['tv'])) { $o .= <<< EOT
Televisione:
@@ -179,7 +179,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['film'])) { +if($txt = prepare_text($a->profile['film'])) { $o .= <<< EOT
Film/danza/cultura/intrattenimento:
@@ -190,7 +190,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['romance'])) { +if($txt = prepare_text($a->profile['romance'])) { $o .= <<< EOT
Amore/romanticismo:
@@ -201,7 +201,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['work'])) { +if($txt = prepare_text($a->profile['work'])) { $o .= <<< EOT
Lavoro/impiego:
@@ -212,7 +212,7 @@ $o .= <<< EOT EOT; } -if($txt = prepare_body($a->profile['education'])) { +if($txt = prepare_text($a->profile['education'])) { $o .= <<< EOT
Scuola/educazione: