aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/identity.php26
-rw-r--r--install/INSTALL.txt3
2 files changed, 16 insertions, 13 deletions
diff --git a/include/identity.php b/include/identity.php
index ad787c22c..66e572866 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -994,32 +994,32 @@ function advanced_profile(&$a) {
if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
- if($txt = bbcode($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
+ if($txt = prepare_text($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
- if($txt = bbcode($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
+ if($txt = prepare_text($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
- if($txt = bbcode($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
+ if($txt = prepare_text($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
- if($txt = bbcode($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
+ if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
- if($txt = bbcode($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
+ if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
- if($txt = bbcode($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
+ if($txt = prepare_text($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
- if($txt = bbcode($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
+ if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
- if($txt = bbcode($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
+ if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
- if($txt = bbcode($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
+ if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
- if($txt = bbcode($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
+ if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
- if($txt = bbcode($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
+ if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
- if($txt = bbcode($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
+ if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
- if($txt = bbcode($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
+ if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
$things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']);
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index c5b560679..74c90826d 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -30,6 +30,9 @@ issues.
Before you begin: Choose a domain name or subdomain name for your server.
+The Red Matrix can only be installed into the root of a domain or
+sub-domain, and can not be installed using alternate TCP ports.
+
Decide if you will use SSL and obtain an SSL certificate before software
installation. You SHOULD use SSL. If you use SSL, you MUST use a
"browser-valid" certificate. You MUST NOT use self-signed certificates!