diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-05 20:06:47 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-05 20:06:47 -0500 |
| commit | 9b13db1c4896e6a8b0a55195530f5449999e811d (patch) | |
| tree | 0588de154eec12481cd56e448a0a682bb94341aa /include/channel.php | |
| parent | 058f7277b52bdcdb80dc3e28bf0ec93a573195a7 (diff) | |
| parent | c462d2f15eb2d463706403676b00bbd7bd111443 (diff) | |
| download | volse-hubzilla-9b13db1c4896e6a8b0a55195530f5449999e811d.tar.gz volse-hubzilla-9b13db1c4896e6a8b0a55195530f5449999e811d.tar.bz2 volse-hubzilla-9b13db1c4896e6a8b0a55195530f5449999e811d.zip | |
Merge branch 'dev' into oauth2
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'); |