Merge branch 'master' of https://github.com/friendica/friendica-addons
This commit is contained in:
commit
236a18cca8
3 changed files with 10 additions and 2 deletions
BIN
facebook.tgz
BIN
facebook.tgz
Binary file not shown.
|
@ -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);
|
||||
|
|
|
@ -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'])) {
|
||||
|
|
Loading…
Reference in a new issue