aboutsummaryrefslogtreecommitdiffstats
path: root/mod/settings.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-07-10 19:30:10 +0100
committerThomas Willingham <founder@kakste.com>2013-07-10 19:30:10 +0100
commit085be3a16f704a3f89bbe4d795c9ca915cc26e8a (patch)
treecd0a1b608630d5e819df221ed84a0fbd3755fc2f /mod/settings.php
parentd065135d909bf876f4c305d303de7642657f7e3e (diff)
parent72d737cc82f5987791c9ceba0c8b99a505886274 (diff)
downloadvolse-hubzilla-085be3a16f704a3f89bbe4d795c9ca915cc26e8a.tar.gz
volse-hubzilla-085be3a16f704a3f89bbe4d795c9ca915cc26e8a.tar.bz2
volse-hubzilla-085be3a16f704a3f89bbe4d795c9ca915cc26e8a.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/settings.php')
-rw-r--r--mod/settings.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/mod/settings.php b/mod/settings.php
index e830d7070..164a2a8a0 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -580,6 +580,11 @@ function settings_content(&$a) {
return;
}
+
+ $channel = $a->get_channel();
+ if($channel)
+ head_set_icon($channel['xchan_photo_s']);
+
// if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
// notice( t('Permission denied.') . EOL );
// return;