aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-10 22:45:04 -0700
committerfriendica <info@friendica.com>2013-09-10 22:45:04 -0700
commit5e230edb85a2f10c43486e8d12b96e2a6ed1109c (patch)
tree785a6f72cb09e4af48d7aad18b8bded586ec94de
parentde777d2f9c7a78c9b43381db2b3369da04750c5c (diff)
downloadvolse-hubzilla-5e230edb85a2f10c43486e8d12b96e2a6ed1109c.tar.gz
volse-hubzilla-5e230edb85a2f10c43486e8d12b96e2a6ed1109c.tar.bz2
volse-hubzilla-5e230edb85a2f10c43486e8d12b96e2a6ed1109c.zip
well that really stuffed things up...
-rwxr-xr-xinclude/items.php2
-rw-r--r--include/zot.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php
index 5a5dfdba1..60a678d1b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1479,7 +1479,7 @@ function item_store($arr,$allow_exec = false) {
$arr['changed'] = datetime_convert();
$arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : '');
$arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : '');
- $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : $arr['mid']);
+ $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : '');
$arr['thr_parent'] = ((x($arr,'thr_parent')) ? notags(trim($arr['thr_parent'])) : $arr['parent_mid']);
$arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : '');
$arr['obj_type'] = ((x($arr,'obj_type')) ? notags(trim($arr['obj_type'])) : '');
diff --git a/include/zot.php b/include/zot.php
index 6deee4d52..dd6d1842c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -945,9 +945,9 @@ function public_recips($msg) {
if($msg['notify']['sender']['url'] === z_root())
- $sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_SITE . " )) ";
+ $sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_SITE . " ) or ( " . $col . " & " . PERMS_PUBLIC . ")) ";
else
- $sql = " where ( " . $col . " & " . PERMS_NETWORK . " ) " ;
+ $sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_PUBLIC . ")) ";
$r = q("select channel_hash as hash from channel " . $sql );