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

Conflicts: mod/import.php
2015-08-26 16:00:13 -07:00 · 2015-08-26 16:00:13 -07:00 · d2fec56456
commit d2fec56456
parent bd2d99aced 71308fe8c1
2 changed files with 1 additions and 2 deletions
--- 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)) 
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2015-08-24.1134
+2015-08-26.1136