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

Also reverted these + added spaces for nicer appearance.

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-15 09:22:38 +01:00
parent 9e28f5a0c3
commit ba3bc420ca
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/api.php
View file

@ -408,13 +408,13 @@
if (is_null($user_info)) $user_info = api_get_user($a); if (is_null($user_info)) $user_info = api_get_user($a);
$arr['$user'] = $user_info; $arr['$user'] = $user_info;
$arr['$rss'] = array( $arr['$rss'] = array(
'alternate' => $user_info['url'], 'alternate' => $user_info['url'],
'self' => $a->get_baseurl(). "/". $a->query_string, 'self' => App::get_baseurl(). "/". $a->query_string,
'base' => $a->get_baseurl(), 'base' => App::get_baseurl(),
'updated' => api_date(null), 'updated' => api_date(null),
'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME), 'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME),
'language' => $user_info['language'], 'language' => $user_info['language'],
'logo' => $a->get_baseurl()."/images/friendica-32.png", 'logo' => App::get_baseurl()."/images/friendica-32.png",
); );
return $arr; return $arr;
@ -1777,7 +1777,7 @@
$start = $page*$count; $start = $page*$count;
// Ugly code - should be changed // Ugly code - should be changed
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = App::get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = substr($myurl,strpos($myurl,'://')+3);
//$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); //$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
$myurl = str_replace('www.','',$myurl); $myurl = str_replace('www.','',$myurl);

2
mod/content.php
View file

@ -197,7 +197,7 @@ function content_content(&$a, $update = 0) {
} }
if($conv) { if($conv) {
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = App::get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace('www.','',$myurl); $myurl = str_replace('www.','',$myurl);
$diasp_url = str_replace('/profile/','/u/',$myurl); $diasp_url = str_replace('/profile/','/u/',$myurl);