diff --git a/facebook.tgz b/facebook.tgz index ca4a858c..edddbb64 100644 Binary files a/facebook.tgz and b/facebook.tgz differ diff --git a/facebook/facebook.php b/facebook/facebook.php index 2c48c7aa..f70524a6 100644 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -332,6 +332,14 @@ function fb_get_friends_sync_parsecontact($uid, $contact) { $contact_id = $r[0]['id']; + $g = q("select def_gid from user where uid = %d limit 1", + intval($uid) + ); + if($g && intval($g[0]['def_gid'])) { + require_once('include/group.php'); + group_add_member($uid,'',$contact_id,$g[0]['def_gid']); + } + require_once("Photo.php"); $photos = import_profile_photo($r[0]['photo'],$uid,$contact_id); diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php index 45aeb080..c7943954 100644 --- a/privacy_image_cache/privacy_image_cache.php +++ b/privacy_image_cache/privacy_image_cache.php @@ -112,7 +112,7 @@ function privacy_image_cache_ping_xmlize_hook(&$a, &$o) { * @param App $a * @param null|object $b */ -function privacy_image_cache_cron(&$a, &$b) { +function privacy_image_cache_cron(&$a = null, &$b = null) { $cachetime = get_config('privacy_image_cache','cache_time'); if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME; @@ -161,7 +161,7 @@ function privacy_image_cache_plugin_admin(&$a, &$o){ * @param App $a * @param null|object $o */ -function privacy_image_cache_plugin_admin_post(&$a, &$o){ +function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){ check_form_security_token_redirectOnErr('/admin/plugins/privacy_image_cache', 'picsave'); if (isset($_REQUEST['save'])) {