Added test for BBCode to Markdown chevron issue

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index add9d50852b6f8e02dfead7e21474fdfe58f4c9e..d3a6c3e38a41d6e3da56d1c95408f55b4afd351d 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -19,6 +19,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
@@ -206,7 +207,7 @@ function profiles_post(App $a) {
                        return;
                }
 
-               $dob = $_POST['dob'] ? Strings::escapeHtml(trim($_POST['dob'])) : '0000-00-00';
+               $dob = !empty($_POST['dob']) ? Strings::escapeHtml(trim($_POST['dob'])) : '0000-00-00';
 
                $y = substr($dob, 0, 4);
                if ((! ctype_digit($y)) || ($y < 1900)) {
@@ -237,17 +238,17 @@ function profiles_post(App $a) {
                        $namechanged = true;
                }
 
-               $pdesc = Strings::escapeTags(trim($_POST['pdesc']));
-               $gender = Strings::escapeTags(trim($_POST['gender']));
-               $address = Strings::escapeTags(trim($_POST['address']));
-               $locality = Strings::escapeTags(trim($_POST['locality']));
-               $region = Strings::escapeTags(trim($_POST['region']));
-               $postal_code = Strings::escapeTags(trim($_POST['postal_code']));
-               $country_name = Strings::escapeTags(trim($_POST['country_name']));
-               $pub_keywords = profile_clean_keywords(Strings::escapeTags(trim($_POST['pub_keywords'])));
-               $prv_keywords = profile_clean_keywords(Strings::escapeTags(trim($_POST['prv_keywords'])));
-               $marital = Strings::escapeTags(trim($_POST['marital']));
-               $howlong = Strings::escapeTags(trim($_POST['howlong']));
+               $pdesc = Strings::escapeTags(trim($_POST['pdesc'] ?? ''));
+               $gender = Strings::escapeTags(trim($_POST['gender'] ?? ''));
+               $address = Strings::escapeTags(trim($_POST['address'] ?? ''));
+               $locality = Strings::escapeTags(trim($_POST['locality'] ?? ''));
+               $region = Strings::escapeTags(trim($_POST['region'] ?? ''));
+               $postal_code = Strings::escapeTags(trim($_POST['postal_code'] ?? ''));
+               $country_name = Strings::escapeTags(trim($_POST['country_name'] ?? ''));
+               $pub_keywords = profile_clean_keywords(Strings::escapeTags(trim($_POST['pub_keywords'] ?? '')));
+               $prv_keywords = profile_clean_keywords(Strings::escapeTags(trim($_POST['prv_keywords'] ?? '')));
+               $marital = Strings::escapeTags(trim($_POST['marital'] ?? ''));
+               $howlong = Strings::escapeTags(trim($_POST['howlong'] ?? ''));
 
                $with = (!empty($_POST['with']) ? Strings::escapeTags(trim($_POST['with'])) : '');
 
@@ -337,7 +338,7 @@ function profiles_post(App $a) {
 
                $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
-               PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
+               PConfig::set(local_user(), 'system', 'detailled_profile', !empty($_POST['detailed_profile']) ? 1: 0);
 
                $changes = [];
                if ($is_default) {
@@ -534,18 +535,18 @@ function profiles_content(App $a) {
                $personal_account = !(in_array($a->user["page-flags"],
                                        [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]));
 
-               $detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
+               $detailed_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
                $is_default = (($r[0]['is-default']) ? 1 : 0);
                $tpl = Renderer::getMarkupTemplate("profile_edit.tpl");
                $o .= Renderer::replaceMacros($tpl, [
                        '$personal_account' => $personal_account,
-                       '$detailled_profile' => $detailled_profile,
+                       '$detailled_profile' => $detailed_profile,
 
                        '$details' => [
-                               'detailled_profile', //Name
+                               'detailed_profile', //Name
                                L10n::t('Show more profile fields:'), //Label
-                               $detailled_profile, //Value
+                               $detailed_profile, //Value
                                '', //Help string
                                [L10n::t('No'), L10n::t('Yes')] //Off - On strings
                        ],
@@ -593,7 +594,7 @@ function profiles_content(App $a) {
                        '$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . L10n::t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
                        '$name' => ['name', L10n::t('Your Full Name:'), $r[0]['name']],
                        '$pdesc' => ['pdesc', L10n::t('Title/Description:'), $r[0]['pdesc']],
-                       '$dob' => Temporal::getDateofBirthField($r[0]['dob']),
+                       '$dob' => Temporal::getDateofBirthField($r[0]['dob'], $a->user['timezone']),
                        '$hide_friends' => $hide_friends,
                        '$address' => ['address', L10n::t('Street Address:'), $r[0]['address']],
                        '$locality' => ['locality', L10n::t('Locality/City:'), $r[0]['locality']],