aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-01-02 14:04:43 -0800
committerzotlabs <mike@macgirvin.com>2018-01-02 14:04:43 -0800
commitada578e7e3fc86970be6d1f242f785dae14f5e30 (patch)
tree8df133a2ee4eab3230d73859d8741fe333db6f0d /include
parent3bd7133ba32d758df935a566c45515a530b35538 (diff)
downloadvolse-hubzilla-ada578e7e3fc86970be6d1f242f785dae14f5e30.tar.gz
volse-hubzilla-ada578e7e3fc86970be6d1f242f785dae14f5e30.tar.bz2
volse-hubzilla-ada578e7e3fc86970be6d1f242f785dae14f5e30.zip
issues with feed parameters
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php7
-rw-r--r--include/zid.php4
2 files changed, 6 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php
index 722757f87..d0b9cffc9 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4063,8 +4063,9 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$item_uids = ' true ';
$item_normal = item_normal();
-
- if ($arr['uid']) $uid= $arr['uid'];
+ if($arr['uid']) {
+ $uid = $arr['uid'];
+ }
if($channel) {
$uid = $channel['channel_id'];
@@ -4226,7 +4227,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$items = q("SELECT item.*, item.id AS item_id FROM item
WHERE $item_uids $item_restrict
$simple_update
- $sql_extra $sql_nets
+ $sql_extra $sql_nets $sql_extra3
ORDER BY item.received DESC $pager_sql"
);
diff --git a/include/zid.php b/include/zid.php
index d1a0fa88a..6ebc9a6ab 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -105,8 +105,8 @@ function strip_zats($s) {
-function clean_query_string() {
- $x = strip_zids(\App::$query_string);
+function clean_query_string($s = '') {
+ $x = strip_zids(($s) ? $s : \App::$query_string);
$x = strip_owt($x);
$x = strip_zats($x);