aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-06-26 09:20:54 +0200
committerMario <mario@mariovavti.com>2019-06-26 09:20:54 +0200
commit1cf012650b2b4c25a34221b0fcca6bc18710108b (patch)
tree41684c1dc88f40a9094316ea2dc027dcb644e5c9 /include
parent1b6fbe3a2e430205ebc92dff4c1bd14b9f903572 (diff)
parent82478eef0960facad62d93c9bd8fcadd56ad4ead (diff)
downloadvolse-hubzilla-1cf012650b2b4c25a34221b0fcca6bc18710108b.tar.gz
volse-hubzilla-1cf012650b2b4c25a34221b0fcca6bc18710108b.tar.bz2
volse-hubzilla-1cf012650b2b4c25a34221b0fcca6bc18710108b.zip
Merge branch 'export_items-export_all' into 'dev'
Export items export all See merge request hubzilla/core!1680
Diffstat (limited to 'include')
-rw-r--r--include/channel.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/channel.php b/include/channel.php
index e4b6df47b..0280cd1cd 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1161,7 +1161,7 @@ function channel_export_items_date($channel_id, $start, $finish) {
$ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()];
}
- $r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created <= '%s' and resource_type = '' order by created",
+ $r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created <= '%s' and resource_type != 'photo' order by created",
intval(ITEM_TYPE_POST),
intval($channel_id),
dbesc($start),
@@ -1223,7 +1223,7 @@ function channel_export_items_page($channel_id, $start, $finish, $page = 0, $lim
$ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()];
}
- $r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and resource_type = '' and created >= '%s' and created <= '%s' order by created limit %d offset %d",
+ $r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and resource_type != 'photo' and created >= '%s' and created <= '%s' order by created limit %d offset %d",
intval(ITEM_TYPE_POST),
intval($channel_id),
dbesc($start),