aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/channel.php6
-rw-r--r--mod/zotfeed.php3
2 files changed, 4 insertions, 5 deletions
diff --git a/mod/channel.php b/mod/channel.php
index 4510ad61d..3f92539ae 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -22,6 +22,7 @@ function channel_init(&$a) {
// Run profile_load() here to make sure the theme is set before
// we start loading content
+
profile_load($a,$which,$profile);
}
@@ -81,12 +82,8 @@ function channel_content(&$a, $update = 0, $load = false) {
$groups = array();
-
- $tab = 'posts';
$o = '';
-
-
if($update) {
// Ensure we've got a profile owner if updating.
$a->profile['profile_uid'] = $update;
@@ -112,7 +109,6 @@ function channel_content(&$a, $update = 0, $load = false) {
if(! $update) {
-
$o .= profile_tabs($a, $is_owner, $a->profile['channel_address']);
$o .= common_friends_visitor_widget($a->profile['profile_uid']);
diff --git a/mod/zotfeed.php b/mod/zotfeed.php
index 6519481d2..76a860139 100644
--- a/mod/zotfeed.php
+++ b/mod/zotfeed.php
@@ -16,6 +16,9 @@ function zotfeed_init(&$a) {
json_return_and_die($result);
}
+ $observer = $a->get_observer();
+
+
$channel_address = ((argc() > 1) ? argv(1) : '');
if($channel_address) {
$r = q("select channel_id from channel where channel_address = '%s' limit 1",