diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-24 10:35:20 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-24 10:35:20 +0100 |
| commit | 089509ab876708ecebeec866e5957d979dd5bffa (patch) | |
| tree | 120563d9209d7696e457faeedce1384fc90c2adb /mod/channel.php | |
| parent | 0d119d83b0a98b2cdd31a01901bbe53374d4e467 (diff) | |
| parent | ae6ae881519446f1ce750e678b5871a5e3866d0e (diff) | |
| download | volse-hubzilla-089509ab876708ecebeec866e5957d979dd5bffa.tar.gz volse-hubzilla-089509ab876708ecebeec866e5957d979dd5bffa.tar.bz2 volse-hubzilla-089509ab876708ecebeec866e5957d979dd5bffa.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/channel.php')
| -rw-r--r-- | mod/channel.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/channel.php b/mod/channel.php index 074017466..3b80e2cb8 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -163,6 +163,7 @@ function channel_content(&$a, $update = 0, $load = false) { $simple_update = ''; if(($update) && (! $load)) { + if ($mid) { $r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1", @@ -258,7 +259,6 @@ function channel_content(&$a, $update = 0, $load = false) { $items = array(); } - if((! $update) && (! $load)) { // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, |