diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-02-08 13:00:53 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-02-08 13:00:53 +0100 |
| commit | 98db8bc015970ce2ca03d53c710aaa8cf40cce87 (patch) | |
| tree | da4207c389b3dbee2d5d678b63b0e35d6f8f986d /mod | |
| parent | fbb635462a5a1f371801741b03b1ecef623d9323 (diff) | |
| parent | d280184b875bb55e39b0e73fd64db036b254bc2c (diff) | |
| download | volse-hubzilla-98db8bc015970ce2ca03d53c710aaa8cf40cce87.tar.gz volse-hubzilla-98db8bc015970ce2ca03d53c710aaa8cf40cce87.tar.bz2 volse-hubzilla-98db8bc015970ce2ca03d53c710aaa8cf40cce87.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_poll.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 85e7fc0af..334e10307 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -28,7 +28,7 @@ function dfrn_poll_init(&$a) { if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) { logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] ); header("Content-type: application/atom+xml"); - $o = get_feed_for($a, '*', $a->argv[1],$last_update); + $o = get_feed_for($a, '', $a->argv[1],$last_update); echo $o; killme(); } diff --git a/mod/photos.php b/mod/photos.php index 1a1ebaac1..9acde458d 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -268,6 +268,13 @@ foreach($_FILES AS $key => $val) { intval($page_owner_uid) ); } + + /* Don't make the item visible if the only change was the album name */ + + $visibility = 0; + if($p[0]['desc'] !== $desc || strlen($rawtags)) + $visibility = 1; + if(! $item_id) { // Create item container @@ -297,6 +304,7 @@ foreach($_FILES AS $key => $val) { $arr['deny_cid'] = $p[0]['deny_cid']; $arr['deny_gid'] = $p[0]['deny_gid']; $arr['last-child'] = 1; + $arr['visible'] = $visibility; $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' . '[/url]'; |