aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-18 16:48:56 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-18 16:48:56 +0100
commit33258803ea0c14d5037f2b5a4f23b424fe1aa301 (patch)
treea6f5faad7070aeb0c81f5420094795225736362e
parent0d232c612b71ba28dba234415185ecfb45a80695 (diff)
parent179730e4851bfb26151502d4473231df86b9c8df (diff)
downloadvolse-hubzilla-33258803ea0c14d5037f2b5a4f23b424fe1aa301.tar.gz
volse-hubzilla-33258803ea0c14d5037f2b5a4f23b424fe1aa301.tar.bz2
volse-hubzilla-33258803ea0c14d5037f2b5a4f23b424fe1aa301.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--include/import.php8
-rw-r--r--include/widgets.php1
-rw-r--r--mod/import.php8
-rw-r--r--version.inc2
4 files changed, 10 insertions, 9 deletions
diff --git a/include/import.php b/include/import.php
index 0fd1ab2a5..ffaea6c1a 100644
--- a/include/import.php
+++ b/include/import.php
@@ -2,7 +2,7 @@
require_once('include/menu.php');
-function import_channel($channel) {
+function import_channel($channel, $account_id) {
if(! array_key_exists('channel_system',$channel)) {
$channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0);
@@ -48,7 +48,7 @@ function import_channel($channel) {
}
unset($channel['channel_id']);
- $channel['channel_account_id'] = get_account_id();
+ $channel['channel_account_id'] = $account_id;
$channel['channel_primary'] = (($seize) ? 1 : 0);
if($channel['channel_pageflags'] & PAGE_ALLOWCODE) {
@@ -72,7 +72,7 @@ function import_channel($channel) {
}
$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
- intval(get_account_id()),
+ intval($account_id),
$channel['channel_guid'] // Already dbesc'd
);
if(! $r) {
@@ -83,7 +83,7 @@ function import_channel($channel) {
// reset
$channel = $r[0];
- set_default_login_identity(get_account_id(),$channel['channel_id'],false);
+ set_default_login_identity($account_id,$channel['channel_id'],false);
logger('import step 1');
$_SESSION['import_step'] = 1;
ref_session_write(session_id(), serialize($_SESSION));
diff --git a/include/widgets.php b/include/widgets.php
index 2b1fb2859..3f8e1f18c 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -7,6 +7,7 @@
require_once('include/dir_fns.php');
require_once('include/contact_widgets.php');
+require_once('include/attach.php');
function widget_profile($args) {
diff --git a/mod/import.php b/mod/import.php
index a33cf339b..02e71233a 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -123,12 +123,12 @@ function import_account(&$a, $account_id) {
if(array_key_exists('channel',$data)) {
if($completed < 1) {
- $channel = import_channel($data['channel']);
+ $channel = import_channel($data['channel'], $account_id);
}
else {
$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
- intval(get_account_id()),
+ intval($account_id),
dbesc($channel['channel_guid'])
);
if($r)
@@ -166,7 +166,7 @@ function import_account(&$a, $account_id) {
if($data['photo']) {
require_once('include/photo/photo_driver.php');
- import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],get_account_id(),$channel['channel_id']);
+ import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],$account_id,$channel['channel_id']);
}
if(is_array($data['profile']))
@@ -335,7 +335,7 @@ function import_account(&$a, $account_id) {
unset($abook['abook_id']);
unset($abook['abook_rating']);
unset($abook['abook_rating_text']);
- $abook['abook_account'] = get_account_id();
+ $abook['abook_account'] = $account_id;
$abook['abook_channel'] = $channel['channel_id'];
if(! array_key_exists('abook_blocked',$abook)) {
$abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001 ) ? 1 : 0);
diff --git a/version.inc b/version.inc
index b6659c788..a1de68ee0 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-17.1219
+2015-11-18.1220