aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-01 18:45:06 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-01 18:45:06 +0200
commite8545628035aea9b6f9093910416fb496f7d75de (patch)
treea2da51b53002a39787c48ef9ae4fbaef6671d620 /include/identity.php
parentfad9594b31629c697bf7ddab9e01d92f4868e605 (diff)
parent1447499776ce07bf48b76435a23de704952e6aa2 (diff)
downloadvolse-hubzilla-e8545628035aea9b6f9093910416fb496f7d75de.tar.gz
volse-hubzilla-e8545628035aea9b6f9093910416fb496f7d75de.tar.bz2
volse-hubzilla-e8545628035aea9b6f9093910416fb496f7d75de.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php
index d822dc69c..8d6a65cad 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -674,7 +674,7 @@ function identity_export_year($channel_id,$year,$month = 0) {
*/
function profile_load(&$a, $nickname, $profile = '') {
- logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
+// logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
$user = q("select channel_id from channel where channel_address = '%s' and channel_removed = 0 limit 1",
dbesc($nickname)
@@ -937,7 +937,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
$marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
$profile['online'] = (($profile['online_status'] === 'online') ? t('Online Now') : False);
- logger('online: ' . $profile['online']);
+
+// logger('online: ' . $profile['online']);
if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) {
$block = true;