diff options
author | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
commit | 912be23e1627211fb417c4b7bced414cbbe38ef0 (patch) | |
tree | 2b8567d800624167b3eadf37c8855deb0ba74b0b /include/contact_widgets.php | |
parent | ff68ea608786a698ad46637ef13854ac1b1e6beb (diff) | |
parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
download | volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2 volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip |
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
Diffstat (limited to 'include/contact_widgets.php')
-rw-r--r-- | include/contact_widgets.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/contact_widgets.php b/include/contact_widgets.php index ee9394e95..a02fea523 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -8,7 +8,7 @@ function findpeople_widget() { $a = get_app(); if(get_config('system','invitation_only')) { - $x = get_pconfig(local_user(),'system','invites_remaining'); + $x = get_pconfig(local_channel(),'system','invites_remaining'); if($x || is_site_admin()) { $a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' . sprintf( tt('%d invitation available','%d invitations available',$x), $x) @@ -16,7 +16,7 @@ function findpeople_widget() { } } - $advanced_search = ((local_user() && get_pconfig(local_user(),'feature','expert')) ? t('Advanced') : false); + $advanced_search = ((local_channel() && get_pconfig(local_channel(),'feature','expert')) ? t('Advanced') : false); return replace_macros(get_markup_template('peoplefind.tpl'),array( '$findpeople' => t('Find Channels'), @@ -30,7 +30,7 @@ function findpeople_widget() { '$inv' => t('Invite Friends'), '$advanced_search' => $advanced_search, '$advanced_hint' => "\r\n" . t('Advanced example: name=fred and country=iceland'), - '$loggedin' => local_user() + '$loggedin' => local_channel() )); } @@ -39,12 +39,12 @@ function findpeople_widget() { function fileas_widget($baseurl,$selected = '') { $a = get_app(); - if(! local_user()) + if(! local_channel()) return ''; $terms = array(); $r = q("select distinct(term) from term where uid = %d and type = %d order by term asc", - intval(local_user()), + intval(local_channel()), intval(TERM_FILE) ); if(! $r) @@ -105,7 +105,7 @@ function common_friends_visitor_widget($profile_uid) { $a = get_app(); - if(local_user() == $profile_uid) + if(local_channel() == $profile_uid) return; $observer_hash = get_observer_hash(); |