harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/identity.php
	install/update.php
This commit is contained in:
redmatrix 2015-09-01 17:08:59 -07:00
commit 515f3bf111
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/identity.php
View File

@ -565,7 +565,6 @@ function identity_basic_export($channel_id, $items = false) {
if(! $items) if(! $items)
return $ret; return $ret;
$r = q("select * from likes where channel_id = %d", $r = q("select * from likes where channel_id = %d",
intval($channel_id) intval($channel_id)
); );

2
version.inc
View File

@ -1 +1 @@
2015-08-31.1141 2015-09-01.1142