diff options
| author | Sem <sembrestels@riseup.net> | 2012-11-05 10:53:47 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-11-05 10:53:47 +0100 |
| commit | 080a5acc3afdaae62da55ff6b970193eca2d6d8d (patch) | |
| tree | 0fcd8b8fb38f2eed0d2553020d7ab42e80364815 | |
| parent | e0bbcb47752c8180381da633d6ddf4703170e0f1 (diff) | |
| download | elgg-080a5acc3afdaae62da55ff6b970193eca2d6d8d.tar.gz elgg-080a5acc3afdaae62da55ff6b970193eca2d6d8d.tar.bz2 | |
Replaced full_url by current_page_url everywhere.
| -rw-r--r-- | engine/classes/ElggMenuBuilder.php | 2 | ||||
| -rw-r--r-- | engine/lib/views.php | 2 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/metatags.php | 4 | ||||
| -rw-r--r-- | views/default/page/elements/head.php | 2 | ||||
| -rw-r--r-- | views/rss/page/default.php | 2 |
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'); |