aboutsummaryrefslogtreecommitdiffstats
path: root/include/channel.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-02-24 08:42:25 +0100
committerMario Vavti <mario@mariovavti.com>2018-02-24 08:42:25 +0100
commitf6d024cb3f2663cd1d61e5fc18546adb93b9a7db (patch)
treed4067d517bfa67c20e9bae0a41d3a882f419735d /include/channel.php
parent1c750dac4187c3872e29c79f0c0856ec8a29331e (diff)
parente6f9f284bf04f0dc0471fa08d7dac118effe4ccb (diff)
downloadvolse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.tar.gz
volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.tar.bz2
volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/channel.php')
-rw-r--r--include/channel.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/channel.php b/include/channel.php
index 625ce16c8..a8ddfa978 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1449,6 +1449,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
'$reddress' => $reddress,
'$rating' => '',
'$contact_block' => $contact_block,
+ '$change_photo' => t('Change your profile photo'),
'$editmenu' => profile_edit_menu($profile['uid'])
));
@@ -1897,7 +1898,7 @@ 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','address','locality','region','postal_code','country_name','marital','sexual','homepage','hometown','keywords','about','contact');
+ $profile_fields_basic = array('fullname','pdesc','chandesc','comms','gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact');
$x = array();
if($profile_fields_basic)
@@ -1912,7 +1913,7 @@ function get_profile_fields_advanced($filter = 0) {
$basic = get_profile_fields_basic($filter);
$profile_fields_advanced = (($filter == 0) ? get_config('system','profile_fields_advanced') : null);
if(! $profile_fields_advanced)
- $profile_fields_advanced = array('partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education');
+ $profile_fields_advanced = array('address','locality','postal_code','partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education');
$x = array();
if($basic)