diff options
author | friendica <info@friendica.com> | 2013-08-26 20:58:07 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-08-26 20:58:07 -0700 |
commit | 31b934eb5e65abc0181918cb21b8e51390966a3d (patch) | |
tree | 2990391e4c8d4e0538046c14de574d23313f77ae | |
parent | 7dfd9435f78939166326755792ed8b319e5b5983 (diff) | |
download | volse-hubzilla-31b934eb5e65abc0181918cb21b8e51390966a3d.tar.gz volse-hubzilla-31b934eb5e65abc0181918cb21b8e51390966a3d.tar.bz2 volse-hubzilla-31b934eb5e65abc0181918cb21b8e51390966a3d.zip |
clone sync was trying to update xchan info in the abook loop.
-rwxr-xr-x | boot.php | 5 | ||||
-rw-r--r-- | include/zot.php | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -293,8 +293,9 @@ define ( 'MENU_ITEM_NEWWIN', 0x0002); * Poll/Survey types */ -define ( 'POLL_SIMPLE_RATING', 0x0001); -define ( 'POLL_MULTIPLE_CHOICE', 0x0002); +define ( 'POLL_SIMPLE_RATING', 0x0001); // 1-5 +define ( 'POLL_TENSCALE', 0x0002); // 1-10 +define ( 'POLL_MULTIPLE_CHOICE', 0x0004); define ( 'POLL_OVERWRITE', 0x8000); // If you vote twice remove the prior entry diff --git a/include/zot.php b/include/zot.php index b74892b19..beff1b139 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1715,7 +1715,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) { $clean = array(); foreach($arr['abook'] as $abook) { foreach($abook as $k => $v) { - if(in_array($k,$disallowed)) + if(in_array($k,$disallowed) || (strpos($k,'abook') !== 0)) continue; $clean[$k] = $v; } |