diff options
| author | friendica <info@friendica.com> | 2012-01-12 18:30:52 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-01-12 18:30:52 -0800 |
| commit | cdd56dc5def723e1ed02a66cc97c7e03bdfa985f (patch) | |
| tree | 153ec059ca374ebb7990550a8dd8ddcf45c4acef | |
| parent | bdfe3ba129b44a4484454720cf32c1fe4464d71d (diff) | |
| download | volse-hubzilla-cdd56dc5def723e1ed02a66cc97c7e03bdfa985f.tar.gz volse-hubzilla-cdd56dc5def723e1ed02a66cc97c7e03bdfa985f.tar.bz2 volse-hubzilla-cdd56dc5def723e1ed02a66cc97c7e03bdfa985f.zip | |
fix return url when deleting network posts with page params
| -rw-r--r-- | mod/network.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/network.php b/mod/network.php index 1f0878ba7..70cb232f6 100644 --- a/mod/network.php +++ b/mod/network.php @@ -240,7 +240,7 @@ function network_content(&$a, $update = 0) { nav_set_selected('network'); - $_SESSION['return_url'] = $a->cmd; + $_SESSION['return_url'] = $a->query_string; $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); @@ -299,7 +299,7 @@ function network_content(&$a, $update = 0) { info( t('Group is empty')); } - $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) "; + $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' ) and deleted = 0 ) "; $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o; } elseif($cid) { @@ -309,7 +309,7 @@ function network_content(&$a, $update = 0) { intval($cid) ); if(count($r)) { - $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " ) "; + $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " and deleted = 0 ) "; $o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o; if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { notice( t('Private messages to this person are at risk of public disclosure.') . EOL); |