harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clone sync was trying to update xchan info in the abook loop.

Browse Source
This commit is contained in:
friendica 2013-08-26 20:58:07 -07:00
parent 7dfd9435f7
commit 31b934eb5e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot.php
View File

@ -293,8 +293,9 @@ define ( 'MENU_ITEM_NEWWIN', 0x0002);
* Poll/Survey types * Poll/Survey types
*/ */
define ( 'POLL_SIMPLE_RATING', 0x0001); define ( 'POLL_SIMPLE_RATING', 0x0001); // 1-5
define ( 'POLL_MULTIPLE_CHOICE', 0x0002); define ( 'POLL_TENSCALE', 0x0002); // 1-10
define ( 'POLL_MULTIPLE_CHOICE', 0x0004);
define ( 'POLL_OVERWRITE', 0x8000); // If you vote twice remove the prior entry define ( 'POLL_OVERWRITE', 0x8000); // If you vote twice remove the prior entry

2
include/zot.php
View File

@ -1715,7 +1715,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
$clean = array(); $clean = array();
foreach($arr['abook'] as $abook) { foreach($arr['abook'] as $abook) {
foreach($abook as $k => $v) { foreach($abook as $k => $v) {
if(in_array($k,$disallowed)) if(in_array($k,$disallowed) || (strpos($k,'abook') !== 0))
continue; continue;
$clean[$k] = $v; $clean[$k] = $v;
} }