App::get_baseurl is now replaced with System::baseUrl
This commit is contained in:
parent
3c24bed412
commit
5adfeb0bd5
134 changed files with 603 additions and 624 deletions
|
@ -124,7 +124,7 @@ function poke_init(App $a) {
|
|||
$arr['origin'] = 1;
|
||||
$arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
|
||||
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . App::get_baseurl() . '/contact/' . $target['id'] . '</id>';
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . System::baseUrl() . '/contact/' . $target['id'] . '</id>';
|
||||
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
|
||||
|
||||
$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
|
||||
|
@ -133,7 +133,7 @@ function poke_init(App $a) {
|
|||
$item_id = item_store($arr);
|
||||
if($item_id) {
|
||||
//q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
|
||||
// dbesc(App::get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
|
||||
// dbesc(System::baseUrl() . '/display/' . $poster['nickname'] . '/' . $item_id),
|
||||
// intval($uid),
|
||||
// intval($item_id)
|
||||
//);
|
||||
|
@ -172,11 +172,11 @@ function poke_content(App $a) {
|
|||
}
|
||||
|
||||
|
||||
$base = App::get_baseurl();
|
||||
$base = System::baseUrl();
|
||||
|
||||
$head_tpl = get_markup_template('poke_head.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($head_tpl,array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$base' => $base
|
||||
));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue