aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-23 20:23:55 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-23 20:23:55 -0700
commiteac9c8a7e66ea3ee40297f057164268cbf2f7158 (patch)
tree27fddae81c70f48d084bcf8ce9c92fc757ba2d37 /include/zot.php
parenta67213627c3124fc55f2545d138d368c4dea0fbe (diff)
parent852d19f2095509a72d9f3f7d39cb300ddb817670 (diff)
downloadvolse-hubzilla-eac9c8a7e66ea3ee40297f057164268cbf2f7158.tar.gz
volse-hubzilla-eac9c8a7e66ea3ee40297f057164268cbf2f7158.tar.bz2
volse-hubzilla-eac9c8a7e66ea3ee40297f057164268cbf2f7158.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php install/update.php util/messages.po
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 178b8fe57..4cc22ac12 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2911,6 +2911,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
$total_feeds ++;
}
+
$disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text');
foreach($arr['abook'] as $abook) {
@@ -2999,7 +3000,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
foreach($clean as $k => $v) {
if($k == 'abook_dob')
$v = dbescdate($v);
-
$r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v)
. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
}