aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-11-05 10:53:47 +0100
committerSem <sembrestels@riseup.net>2012-11-05 10:53:47 +0100
commit080a5acc3afdaae62da55ff6b970193eca2d6d8d (patch)
tree0fcd8b8fb38f2eed0d2553020d7ab42e80364815 /engine
parente0bbcb47752c8180381da633d6ddf4703170e0f1 (diff)
downloadelgg-080a5acc3afdaae62da55ff6b970193eca2d6d8d.tar.gz
elgg-080a5acc3afdaae62da55ff6b970193eca2d6d8d.tar.bz2
Replaced full_url by current_page_url everywhere.
Diffstat (limited to 'engine')
-rw-r--r--engine/classes/ElggMenuBuilder.php2
-rw-r--r--engine/lib/views.php2
2 files changed, 2 insertions, 2 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 {