diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-03-05 08:54:46 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-03-05 08:54:46 +0100 |
commit | a0e390c6c89c4009fc2a29ffbefabb0a135d67cf (patch) | |
tree | 64993f75fabca35b86cdc7f6496de32cc71265cd /include/channel.php | |
parent | fd7d3f9286b1a399db074a78cdc63ab1f0b05686 (diff) | |
parent | 59a2057fa0faac2db7b36a5d6c40435c6e13d378 (diff) | |
download | volse-hubzilla-a0e390c6c89c4009fc2a29ffbefabb0a135d67cf.tar.gz volse-hubzilla-a0e390c6c89c4009fc2a29ffbefabb0a135d67cf.tar.bz2 volse-hubzilla-a0e390c6c89c4009fc2a29ffbefabb0a135d67cf.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/channel.php')
-rw-r--r-- | include/channel.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/channel.php b/include/channel.php index a8ddfa978..a754d3504 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1126,8 +1126,7 @@ function channel_export_items($channel_id, $start, $finish) { /** * @brief Loads a profile into the App structure. * - * The function requires a writeable copy of the main App structure, and the - * nickname of a valid channel. + * The function requires the nickname of a valid channel. * * Permissions of the current observer are checked. If a restricted profile is available * to the current observer, that will be loaded instead of the channel default profile. @@ -1897,6 +1896,7 @@ function is_public_profile() { function get_profile_fields_basic($filter = 0) { $profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null); + if(! $profile_fields_basic) $profile_fields_basic = array('fullname','pdesc','chandesc','comms','gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact'); |