diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-27 11:24:02 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-27 11:24:02 +0100 |
| commit | cf5383fdbe273af6b3858e216b313124fd125cf6 (patch) | |
| tree | a220d55b6624c76421a6173aec785958103aa92a /include/identity.php | |
| parent | 21f2df399d3e21b6322ece16717efe88bcc21621 (diff) | |
| parent | 6126070a1d53c3ef4f59c8a0a6160610ef16563c (diff) | |
| download | volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.tar.gz volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.tar.bz2 volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/identity.php b/include/identity.php index a389a613e..caf2de710 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1237,10 +1237,6 @@ function advanced_profile(&$a) { if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'view_profile')) return ''; - $o = ''; - - $o .= '<h2>' . t('Profile') . '</h2>'; - if($a->profile['name']) { $tpl = get_markup_template('profile_advanced.tpl'); @@ -1351,6 +1347,10 @@ function advanced_profile(&$a) { $profile['extra_fields'] = $a->profile['extra_fields']; } + + $is_owner = (($a->profile['profile_uid'] == local_channel()) ? true : false); + $edit = (($is_owner) ? array('link' => $a->get_baseurl() . '/profiles/' . $a->profile['profile_uid'], 'label' => t('Edit')) : ''); + $things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']); // logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); @@ -1360,6 +1360,7 @@ function advanced_profile(&$a) { '$canlike' => (($profile['canlike'])? true : false), '$likethis' => t('Like this thing'), '$profile' => $profile, + '$edit' => $edit, '$things' => $things )); } @@ -1831,8 +1832,7 @@ function get_zcard($channel,$observer_hash = '',$args = array()) { $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale']; } else { - // @fixme remove this when we have a fallback cover photo and use that instead. - return; + $cover = $pphoto; } $o .= replace_macros(get_markup_template('zcard.tpl'),array( |