diff options
| -rw-r--r-- | mod/bookmarks/views/default/object/bookmarks.php | 6 | ||||
| -rw-r--r-- | mod/ecml/views/default/ecml/input_ext.php | 4 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/activity_latest.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/river/forum/create.php | 2 | ||||
| -rwxr-xr-x | mod/profile/views/default/profile/admin_menu.php | 2 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/menu/adminlinks.php | 2 | ||||
| -rw-r--r-- | views/default/admin/site/advanced.php | 2 | ||||
| -rw-r--r-- | views/default/admin/site/basic.php | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 4d69e735d..db41eee40 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -56,7 +56,7 @@ if (@file_exists($faviconurl)) { //delete if($vars['entity']->canEdit()){ $delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array( - 'href' => $vars['url'] . "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid, + 'href' => elgg_get_site_url() . "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid, 'text' => elgg_echo("delete"), 'confirm' => elgg_echo("bookmarks:delete:confirm"), )) . "</span>"; @@ -70,14 +70,14 @@ $info .= elgg_view_likes($vars['entity']); // include likes //include edit and delete options if($vars['entity']->canEdit()){ - $info .= "<span class='entity_edit'><a href=\"{$vars['url']}pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>"; + $info .= "<span class='entity_edit'><a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>"; $info .= $delete; } $info .= "</div>"; $info .= "<p class='entity_title'><a href=\"{$address}\" target=\"_blank\">{$title}</a></p>"; -$info .= "<p class='entity_subtext'>Bookmarked by <a href=\"{$vars['url']}pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>"; +$info .= "<p class='entity_subtext'>Bookmarked by <a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>"; $tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags)); if (!empty($tags)) { diff --git a/mod/ecml/views/default/ecml/input_ext.php b/mod/ecml/views/default/ecml/input_ext.php index 6ea688e99..f9ab942e0 100644 --- a/mod/ecml/views/default/ecml/input_ext.php +++ b/mod/ecml/views/default/ecml/input_ext.php @@ -5,6 +5,6 @@ * @package ECML */ -$docs_href = "{$vars['url']}pg/ecml"; +$docs_href = elgg_get_site_url()."pg/ecml"; ?> -<a href="<?php echo $docs_href; ?>" class="longtext_control" title="<?php echo elgg_echo('ecml:help'); ?>" target="_new"><img src="<?php echo $vars['url']; ?>mod/ecml/graphics/ecml.png" width="50" height="15" alt="ECML" /></a>
\ No newline at end of file +<a href="<?php echo $docs_href; ?>" class="longtext_control" title="<?php echo elgg_echo('ecml:help'); ?>" target="_new"><img src="<?php echo elgg_get_site_url(); ?>mod/ecml/graphics/ecml.png" width="50" height="15" alt="ECML" /></a>
\ No newline at end of file diff --git a/mod/groups/views/default/groups/activity_latest.php b/mod/groups/views/default/groups/activity_latest.php index ea16964c3..3ac385553 100644 --- a/mod/groups/views/default/groups/activity_latest.php +++ b/mod/groups/views/default/groups/activity_latest.php @@ -5,7 +5,7 @@ * @package Groups */ ?> -<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/groups/activity/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span> +<span class="group_widget_link"><a href="<?php echo elgg_get_site_url() . "pg/groups/activity/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span> <h3><?php echo elgg_echo("activity"); ?></h3> <?php $owner = elgg_get_page_owner(); diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php index f8b86d842..ce3638f15 100644 --- a/mod/groups/views/default/river/forum/create.php +++ b/mod/groups/views/default/river/forum/create.php @@ -14,7 +14,7 @@ $comment = get_annotation($vars['item']->annotation_id)->value; } $comment = strip_tags($comment);//this is so we don't get large images etc in the activity river - $url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid; + $url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid; $url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; $string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " "; $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>"; diff --git a/mod/profile/views/default/profile/admin_menu.php b/mod/profile/views/default/profile/admin_menu.php index e901442c2..076cdd49c 100755 --- a/mod/profile/views/default/profile/admin_menu.php +++ b/mod/profile/views/default/profile/admin_menu.php @@ -7,7 +7,7 @@ global $CONFIG; if (isadminloggedin()){ if (get_loggedin_userid()!=elgg_get_page_owner_guid()){ $user = get_user(elgg_get_page_owner_guid()); - $url = $vars['url']; + $url = elgg_get_site_url(); $ts = time(); $token = generate_action_token($ts); diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php index 020240261..c7fd99857 100644 --- a/mod/profile/views/default/profile/menu/adminlinks.php +++ b/mod/profile/views/default/profile/menu/adminlinks.php @@ -10,7 +10,7 @@ if (isadminloggedin()){ if (get_loggedin_userid()!=$vars['entity']->guid){ ?> - <a href="<?php echo $vars['url']; ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a> + <a href="<?php echo elgg_get_site_url(); ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a> <?php if (!$vars['entity']->isBanned()) { echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => elgg_get_site_url()."action/admin/user/ban?guid={$vars['entity']->guid}")); diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php index 2bf32d198..00e63e95d 100644 --- a/views/default/admin/site/advanced.php +++ b/views/default/admin/site/advanced.php @@ -6,7 +6,7 @@ * @subpackage Core */ -$action = $vars['url'] . "action/admin/site/update_advanced"; +$action = elgg_get_site_url() . "action/admin/site/update_advanced"; $form_body = ""; diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php index d8d1618d1..f6b2d03e0 100644 --- a/views/default/admin/site/basic.php +++ b/views/default/admin/site/basic.php @@ -6,7 +6,7 @@ * @subpackage Core */ -$action = $vars['url'] . "action/admin/site/update_basic"; +$action = elgg_get_site_url() . "action/admin/site/update_basic"; $form_body = ""; |