strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1897 from annando/3.4.2

Browse source 
Bugfix: Following mail accounts is now possible again
This commit is contained in:
Tobias Diekershoff 2015-09-23 06:20:49 +02:00
parent 05d981be14 7c8c8b821a
commit 53719d4ecc
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/Scrape.php
View file

@ -819,7 +819,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
} }
} }
Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY); // Only store into the cache if the value seems to be valid
if ($result['network'] != NETWORK_FEED)
Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY);
return $result; return $result;
} }

13
mod/follow.php
View file

@ -2,6 +2,7 @@
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/follow.php'); require_once('include/follow.php');
require_once('include/contact_selectors.php');
function follow_content(&$a) { function follow_content(&$a) {
@ -30,6 +31,9 @@ function follow_content(&$a) {
$ret = probe_url($url); $ret = probe_url($url);
if ($ret["network"] == NETWORK_MAIL)
$ret["url"] = $ret["addr"];
if($ret['network'] === NETWORK_DFRN) { if($ret['network'] === NETWORK_DFRN) {
$request = $ret["request"]; $request = $ret["request"];
$tpl = get_markup_template('dfrn_request.tpl'); $tpl = get_markup_template('dfrn_request.tpl');
@ -51,8 +55,15 @@ function follow_content(&$a) {
// Makes the connection request for friendica contacts easier // Makes the connection request for friendica contacts easier
$_SESSION["fastlane"] = $ret["url"]; $_SESSION["fastlane"] = $ret["url"];
$header = $ret["name"];
if ($ret["addr"] != "")
$header .= " <".$ret["addr"].">";
$header .= " (".network_to_name($ret['network']).")";
$o = replace_macros($tpl,array( $o = replace_macros($tpl,array(
'$header' => $ret["name"]." (".$ret["addr"].")", '$header' => htmlentities($header),
'$photo' => $ret["photo"], '$photo' => $ret["photo"],
'$desc' => "", '$desc' => "",
'$pls_answer' => t('Please answer the following:'), '$pls_answer' => t('Please answer the following:'),