tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Continued with #3010:

Browse source 
- removed added debug messages (maybe they will come back in accordance to
  code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
  (substr($url, 0, 4) !== 'http') on $url = 'https://bla'; will be FALSE
  (means found http at start), too.

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-14 16:59:35 +01:00
commit 23d4db5149
5 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/dfrn.php
View file

@ -1525,7 +1525,7 @@ class dfrn {
"to_email" => $importer["email"],
"uid" => $importer["importer_uid"],
"item" => $suggest,
"link" => $a->get_baseurl()."/notifications/intros",
"link" => App::get_baseurl()."/notifications/intros",
"source_name" => $importer["name"],
"source_link" => $importer["url"],
"source_photo" => $importer["photo"],
@ -1792,8 +1792,6 @@ class dfrn {
* @param int $posted_id The record number of item record that was just posted
*/
private function do_poke($item, $importer, $posted_id) {
$a = get_app();
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
if(!$verb)
return;
@ -1813,7 +1811,7 @@ class dfrn {
}
}
if($Blink && link_compare($Blink,$a->get_baseurl()."/profile/".$importer["nickname"])) {
if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) {
// send a notification
notification(array(
@ -1824,7 +1822,7 @@ class dfrn {
"to_email" => $importer["email"],
"uid" => $importer["importer_uid"],
"item" => $item,
"link" => $a->get_baseurl()."/display/".urlencode(get_item_guid($posted_id)),
"link" => App::get_baseurl()."/display/".urlencode(get_item_guid($posted_id)),
"source_name" => stripslashes($item["author-name"]),
"source_link" => $item["author-link"],
"source_photo" => ((link_compare($item["author-link"],$importer["url"]))