8 files changed, 15 insertions, 15 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 8455d95c..183c26d0 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -42,9 +42,9 @@ class Albums_Controller extends Items_Controller {
       $index = $album->get_position($show);
       $page = ceil($index / $page_size);
       if ($page == 1) {
-        url::redirect($album->url());
+        url::redirect($album->abs_url());
       } else {
-        url::redirect($album->url("page=$page"));
+        url::redirect($album->abs_url("page=$page"));
       }
     }
 
@@ -55,9 +55,9 @@ class Albums_Controller extends Items_Controller {
 
     // Make sure that the page references a valid offset
     if ($page < 1) {
-      url::redirect($album->url());
+      url::redirect($album->abs_url());
     } else if ($page > $max_pages) {
-      url::redirect($album->url("page=$max_pages"));
+      url::redirect($album->abs_url("page=$max_pages"));
     }
 
     $template = new Theme_View("page.html", "album");
diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php
index 13891726..7f60f2b7 100644
--- a/modules/gallery/controllers/items.php
+++ b/modules/gallery/controllers/items.php
@@ -25,6 +25,6 @@ class Items_Controller extends REST_Controller {
     // differently.  We could also just delegate here, but it feels more appropriate
     // to have a single canonical resource mapping.
     access::required("view", $item);
-    return url::redirect($item->url(array(), true));
+    return url::redirect($item->abs_url());
   }
 }
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 16d39024..6e19310b 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -90,14 +90,14 @@ class L10n_Client_Controller extends Controller {
     }
 
     $session = Session::instance();
-                $l10n_mode = $session->get("l10n_mode", false);
+    $l10n_mode = $session->get("l10n_mode", false);
     $session->set("l10n_mode", !$l10n_mode);
 
     $redirect_url = "admin/languages";
-                if (!$l10n_mode) {
-                        $redirect_url .= "#l10n-client";
-                }
- 
+    if (!$l10n_mode) {
+      $redirect_url .= "#l10n-client";
+    }
+
     url::redirect($redirect_url);
   }
 
diff --git a/modules/gallery/controllers/welcome_message.php b/modules/gallery/controllers/welcome_message.php
index a4b690e3..8fd1e0a0 100644
--- a/modules/gallery/controllers/welcome_message.php
+++ b/modules/gallery/controllers/welcome_message.php
@@ -20,7 +20,7 @@
 class Welcome_Message_Controller extends Controller {
   public function index() {
     if (!user::active()->admin) {
-      url::redirect(item::root()->url());
+      url::redirect(item::root()->abs_url());
     }
 
     $v = new View("welcome_message.html");
diff --git a/modules/notification/controllers/notification.php b/modules/notification/controllers/notification.php
index 5745de5d..d502b9fe 100644
--- a/modules/notification/controllers/notification.php
+++ b/modules/notification/controllers/notification.php
@@ -31,6 +31,6 @@ class Notification_Controller extends Controller {
       notification::add_watch($item);
       message::success(sprintf(t("You are now watching %s"), html::purify($item->title)));
     }
-    url::redirect($item->url(array(), true));
+    url::redirect($item->abs_url());
   }
 }
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index dcac0723..8bee7db5 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -48,7 +48,7 @@ class Login_Controller extends Controller {
 
     list ($valid, $form) = $this->_auth("login/auth_html");
     if ($valid) {
-      url::redirect(item::root()->url());
+      url::redirect(item::root()->abs_url());
     } else {
       print $form;
     }
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 3bf274a6..45d397ad 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -31,7 +31,7 @@ class Logout_Controller extends Controller {
         // Don't use url::redirect() because it'll call url::site() and munge the continue url.
         header("Location: $continue_url");
       } else {
-        url::redirect(item::root()->url());
+        url::redirect(item::root()->abs_url());
       }
     }
   }
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 8c18916e..92608dcd 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -130,7 +130,7 @@ class Password_Controller extends Controller {
       $user->hash = null;
       $user->save();
       message::success(t("Password reset successfully"));
-      url::redirect(item::root()->url());
+      url::redirect(item::root()->abs_url());
     } else {
       print $view;
     }