diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/editpost.php | 1 | ||||
| -rw-r--r-- | mod/item.php | 3 | ||||
| -rw-r--r-- | mod/network.php | 4 | ||||
| -rw-r--r-- | mod/photos.php | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/mod/editpost.php b/mod/editpost.php index 3c92e8bbe..fd84fc26d 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -35,6 +35,7 @@ function editpost_content(&$a) { $a->page['htmlhead'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), + '$ispublic' => t('Visible to <strong>everybody</strong>'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] )); diff --git a/mod/item.php b/mod/item.php index 7b561fcca..c4f368fd0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -671,7 +671,8 @@ function item_content(&$a) { // send the notification upstream/downstream as the case may be proc_run('php',"include/notifier.php","drop","$drop_id"); - +// We seem to lose the return url occasionally. Have not been able to reliably duplicate +// logger('drop_return_url: ' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED } diff --git a/mod/network.php b/mod/network.php index ae991e6ee..7ad5058bf 100644 --- a/mod/network.php +++ b/mod/network.php @@ -137,7 +137,7 @@ function network_content(&$a, $update = 0) { notice( t('Group is empty')); } - $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) "; + $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) "; $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o; } elseif($cid) { @@ -164,11 +164,13 @@ function network_content(&$a, $update = 0) { if((! $group) && (! $cid) && (! $update)) $o .= get_birthdays(); + $sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` "); $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + $sql_extra2 $sql_extra ", intval($_SESSION['uid']) ); diff --git a/mod/photos.php b/mod/photos.php index 5f4c5b391..7f94bc520 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -639,6 +639,9 @@ foreach($_FILES AS $key => $val) { $item_id = item_store($arr); + if($visible) + proc_run('php', "include/notifier.php", 'wall-new', $item_id); + call_hooks('photo_post_end',intval($item_id)); // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook |