aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/classes/ElggMenuBuilder.php2
-rw-r--r--engine/lib/views.php2
-rw-r--r--mod/profile/views/default/profile/metatags.php4
-rw-r--r--views/default/page/elements/head.php2
-rw-r--r--views/rss/page/default.php2
5 files changed, 6 insertions, 6 deletions
diff --git a/engine/classes/ElggMenuBuilder.php b/engine/classes/ElggMenuBuilder.php
index de0017599..06000c923 100644
--- a/engine/classes/ElggMenuBuilder.php
+++ b/engine/classes/ElggMenuBuilder.php
@@ -158,7 +158,7 @@ class ElggMenuBuilder {
// scan looking for a selected item
foreach ($this->menu as $menu_item) {
if ($menu_item->getHref()) {
- if (elgg_http_url_is_identical(full_url(), $menu_item->getHref())) {
+ if (elgg_http_url_is_identical(current_page_url(), $menu_item->getHref())) {
$menu_item->setSelected(true);
return $menu_item;
}
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 6135026a7..b92d9c57a 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1567,7 +1567,7 @@ function autoregister_views($view_base, $folder, $base_location_path, $viewtype)
function elgg_views_add_rss_link() {
global $autofeed;
if (isset($autofeed) && $autofeed == true) {
- $url = full_url();
+ $url = current_page_url();
if (substr_count($url, '?')) {
$url .= "&view=rss";
} else {
diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php
index c6f674e6d..52048b8a7 100644
--- a/mod/profile/views/default/profile/metatags.php
+++ b/mod/profile/views/default/profile/metatags.php
@@ -10,7 +10,7 @@ $owner = elgg_get_page_owner_entity();
if (elgg_instanceof($owner, 'user')) {
?>
- <link rel="meta" type="application/rdf+xml" title="FOAF" href="<?php echo full_url(); ?>?view=foaf" />
+ <link rel="meta" type="application/rdf+xml" title="FOAF" href="<?php echo current_page_url(); ?>?view=foaf" />
<?php
-} \ No newline at end of file
+}
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 1eb2be088..d4a95b4d0 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -14,7 +14,7 @@ if (empty($vars['title'])) {
global $autofeed;
if (isset($autofeed) && $autofeed == true) {
- $url = full_url();
+ $url = current_page_url();
if (substr_count($url,'?')) {
$url .= "&view=rss";
} else {
diff --git a/views/rss/page/default.php b/views/rss/page/default.php
index c973e3fd0..a7b757760 100644
--- a/views/rss/page/default.php
+++ b/views/rss/page/default.php
@@ -17,7 +17,7 @@ if (empty($vars['title'])) {
}
// Remove RSS from URL
-$url = str_replace('?view=rss', '', full_url());
+$url = str_replace('?view=rss', '', current_page_url());
$url = str_replace('&view=rss', '', $url);
$url = htmlspecialchars($url, ENT_NOQUOTES, 'UTF-8');