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:
	mod/import.php
This commit is contained in:
redmatrix 2015-08-26 16:00:13 -07:00
commit d2fec56456
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/import.php
View File

@ -257,7 +257,6 @@ function import_post(&$a) {
$profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id']; $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id'];
$profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id']; $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id'];
dbesc_array($profile); dbesc_array($profile);
$r = dbq("INSERT INTO profile (`" $r = dbq("INSERT INTO profile (`"
. implode("`, `", array_keys($profile)) . implode("`, `", array_keys($profile))

2
version.inc
View File

@ -1 +1 @@
2015-08-24.1134 2015-08-26.1136