diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-15 16:49:54 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-15 16:49:54 +0200 |
| commit | a147d6113c081694d4209002fa5e57106d4c6f41 (patch) | |
| tree | de6f940efa0439ab3d54ff7d280e221b7b59d348 /include/items.php | |
| parent | e825a73f1de308b6ae0ae3cc5549263704a14594 (diff) | |
| parent | f994f9abc6092106659a29f5ee1be0706825c203 (diff) | |
| download | volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.gz volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.bz2 volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rw-r--r-- | include/items.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 05c0d5016..85df340d3 100644 --- a/include/items.php +++ b/include/items.php @@ -19,9 +19,15 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) $converse = true; if($a->argv[$x] == 'starred') $starred = true; + if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) + $category = $a->argv[$x+1]; } + + } + + // default permissions - anonymous user $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' "; @@ -101,6 +107,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) if(! strlen($last_update)) $last_update = 'now -30 days'; + if(x($category)) { + $sql_extra .= file_tag_file_query('item',$category,'category'); + } + if($public_feed) { if(! $converse) $sql_extra .= " AND `contact`.`self` = 1 "; |