aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-01 17:08:59 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-01 17:08:59 -0700
commit515f3bf111ceeaae5299a62e8508b13f323f7bcf (patch)
tree650661a98a230177a307fffcf4c9f2ce9045b6b1 /include/identity.php
parent3852b5ce7fe83cce93c0826a92c378a589bc8664 (diff)
parentd753ae4cf1bb0f9c9f4e59ccbaaca6342ef144be (diff)
downloadvolse-hubzilla-515f3bf111ceeaae5299a62e8508b13f323f7bcf.tar.gz
volse-hubzilla-515f3bf111ceeaae5299a62e8508b13f323f7bcf.tar.bz2
volse-hubzilla-515f3bf111ceeaae5299a62e8508b13f323f7bcf.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/identity.php install/update.php
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/identity.php b/include/identity.php
index 8d6a65cad..9ff5af4fe 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -565,7 +565,6 @@ function identity_basic_export($channel_id, $items = false) {
if(! $items)
return $ret;
-
$r = q("select * from likes where channel_id = %d",
intval($channel_id)
);