aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-15 18:15:25 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-15 18:15:25 -0700
commit95cf1668de7cd584e25ee7c66cfaaa0183979f20 (patch)
treed5ad244309fdaccf54d7205f0727c60d94b3f319 /include
parent6046fe9c9ebed8ae2ad7507fdf75c53e0cad3f2b (diff)
parent59b67d52e60d51faa39cdad1921a64e8f64ea0ae (diff)
downloadvolse-hubzilla-95cf1668de7cd584e25ee7c66cfaaa0183979f20.tar.gz
volse-hubzilla-95cf1668de7cd584e25ee7c66cfaaa0183979f20.tar.bz2
volse-hubzilla-95cf1668de7cd584e25ee7c66cfaaa0183979f20.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'include')
-rw-r--r--include/zot.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php
index a43c6bc1b..4342a806a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2854,7 +2854,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
}
if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
- $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags');
+ if(array_key_exists('channel_removed',$arr['channel']))
+ $arr['channel_pageflags'] |= PAGE_REMOVED;
+ if(array_key_exists('channel_system',$arr['channel']))
+ $arr['channel_pageflags'] |= PAGE_SYSTEM;
+
+ $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_system');
$clean = array();
foreach($arr['channel'] as $k => $v) {
@@ -3167,7 +3172,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
}
if(count($clean)) {
foreach($clean as $k => $v) {
- $r = dbq("UPDATE profile set " . dbesc($k) . " = '" . dbesc($v)
+ $r = dbq("UPDATE profile set `" . dbesc($k) . "` = '" . dbesc($v)
. "' where profile_guid = '" . dbesc($profile['profile_guid']) . "' and uid = " . intval($channel['channel_id']));
}
}