clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1601-dfrn

Browse Source
This commit is contained in:
Michael Vogel
2016-01-25 23:51:11 +01:00
parent 778d9250c6 7ea3923429
commit 4208acf4b6
10 changed files with 360 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/onepoll.php
+3 -1
View File
@@ -334,7 +334,9 @@ function onepoll_run(&$argv, &$argc){
if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
return;
$xml = fetch_url($contact['poll']);
$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
$xml = fetch_url($contact['poll'], false, $redirects, 0, Null, $cookiejar);
unlink($cookiejar);
}
elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {