Replaced full_url by current_page_url everywhere.

diff --git a/engine/classes/ElggMenuBuilder.php b/engine/classes/ElggMenuBuilder.php
index de0017599199567ae131eca2ec347db6b9fb97e2..06000c92387a71e20e798222667b5b54b37bdf80 100644 (file)
--- 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 6135026a74280b31bf780dd8349e320244e1fe72..b92d9c57a49951ec6a6979c5a741de61091cb772 100644 (file)
--- 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 c6f674e6d4a1eb11db40f2a28c4ce78e72f58d07..52048b8a7377dcb8409a8c8f9a53fc1a0ff5c895 100644 (file)
--- 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 1eb2be08892596e361a45966f917f4465ba736ec..d4a95b4d0d89db2c8c3123d6a1344870fa25ec6f 100644 (file)
--- 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 c973e3fd085b3f9269cae4d9e1a3be666ac48e45..a7b757760f1b5b5256ac20411e75f69751c10a13 100644 (file)
--- 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');