aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-31 16:24:05 -0700
committerfriendica <info@friendica.com>2014-08-31 16:24:05 -0700
commit2d0ad0625a1bc8bc54ad21d1a5ebb057b0afa357 (patch)
treee8e731a0a2d42151678f1c22fb3adc24ec5aff4d
parent45c35d97b8ce627cb90efa320b7daca4097aef75 (diff)
downloadvolse-hubzilla-2d0ad0625a1bc8bc54ad21d1a5ebb057b0afa357.tar.gz
volse-hubzilla-2d0ad0625a1bc8bc54ad21d1a5ebb057b0afa357.tar.bz2
volse-hubzilla-2d0ad0625a1bc8bc54ad21d1a5ebb057b0afa357.zip
sql error in profile_activity
-rw-r--r--include/activities.php2
-rw-r--r--include/zot.php6
-rw-r--r--version.inc2
3 files changed, 4 insertions, 6 deletions
diff --git a/include/activities.php b/include/activities.php
index 4502b758e..d978ebcd6 100644
--- a/include/activities.php
+++ b/include/activities.php
@@ -25,7 +25,7 @@ function profile_activity($changed, $value) {
$arr['verb'] = ACTIVITY_UPDATE;
$arr['obj_type'] = ACTIVITY_OBJ_PROFILE;
- $arr['$plink'] = z_root() . '/channel/' . $self['channel_address'] . '/?f=&mid=' . $arr['mid'];
+ $arr['plink'] = z_root() . '/channel/' . $self['channel_address'] . '/?f=&mid=' . $arr['mid'];
$A = '[url=' . z_root() . '/channel/' . $self['channel_address'] . ']' . $self['channel_name'] . '[/url]';
diff --git a/include/zot.php b/include/zot.php
index 8627656c2..6ccee8c39 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1791,8 +1791,6 @@ function process_mail_delivery($sender,$arr,$deliveries) {
function process_profile_delivery($sender,$arr,$deliveries) {
- // deliveries is irrelevant, what to do about birthday notification....?
-
logger('process_profile_delivery', LOGGER_DEBUG);
$r = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1",
@@ -1864,7 +1862,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
$update = false;
foreach($r[0] as $k => $v) {
if((array_key_exists($k,$arr)) && ($arr[$k] != $v)) {
- logger('import_directory_profile: update' . $k . ' => ' . $arr[$k]);
+ logger('import_directory_profile: update ' . $k . ' => ' . $arr[$k]);
$update = true;
break;
}
@@ -1906,7 +1904,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
}
else {
$update = true;
- logger('import_directory_profile: new profile');
+ logger('import_directory_profile: new profile ');
$x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_about, xprof_homepage, xprof_hometown, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
dbesc($arr['xprof_hash']),
dbesc($arr['xprof_desc']),
diff --git a/version.inc b/version.inc
index 309a291d2..29de108fb 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-08-30.783
+2014-08-31.784