aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-22 14:06:52 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-22 14:06:52 -0800
commit292b02b58ccb18d10de948d30ccc0cc6ba345d5e (patch)
tree404db2ff100013f975dc42957425b4491eeb5990
parent427652e9bd8e312758f04c6c3e6824fb47cc3033 (diff)
downloadvolse-hubzilla-292b02b58ccb18d10de948d30ccc0cc6ba345d5e.tar.gz
volse-hubzilla-292b02b58ccb18d10de948d30ccc0cc6ba345d5e.tar.bz2
volse-hubzilla-292b02b58ccb18d10de948d30ccc0cc6ba345d5e.zip
webpages and design elements weren't being included in the item export query.
-rw-r--r--include/identity.php3
-rw-r--r--version.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php
index 4682cf624..95ade3b28 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -710,7 +710,8 @@ function identity_export_year($channel_id,$year,$month = 0) {
else
$maxdate = datetime_convert('UTC','UTC',$year+1 . '-01-01 00:00:00');
- $r = q("select * from item where item_wall = 1 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 = '' order by created",
+ intval(ITEM_TYPE_POST),
intval($channel_id),
dbesc($mindate),
dbesc($maxdate)
diff --git a/version.inc b/version.inc
index 05ca8c657..c6bcb1648 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-20.1222
+2015-11-22.1224