diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-08-26 16:00:13 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-26 16:00:13 -0700 |
commit | d2fec56456181fd54d11dcb24927e17c6bdd47dc (patch) | |
tree | 6bfb2b71d3f9bb93a2832d6382ac115725d053a1 /mod/import.php | |
parent | bd2d99aced589797b124cec10212572e565fc519 (diff) | |
parent | 71308fe8c157471ec43ac6af190114ef03cc78c9 (diff) | |
download | volse-hubzilla-d2fec56456181fd54d11dcb24927e17c6bdd47dc.tar.gz volse-hubzilla-d2fec56456181fd54d11dcb24927e17c6bdd47dc.tar.bz2 volse-hubzilla-d2fec56456181fd54d11dcb24927e17c6bdd47dc.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/import.php
Diffstat (limited to 'mod/import.php')
-rw-r--r-- | mod/import.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mod/import.php b/mod/import.php index d081a18e4..bf1f0ca2e 100644 --- a/mod/import.php +++ b/mod/import.php @@ -257,7 +257,6 @@ function import_post(&$a) { $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id']; $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id']; - dbesc_array($profile); $r = dbq("INSERT INTO profile (`" . implode("`, `", array_keys($profile)) |