Also reverted these + added spaces for nicer appearance.
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
c830bfcd96
commit
6cef88c24e
2 changed files with 8 additions and 8 deletions
|
@ -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);
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue