3 files changed, 5 insertions, 5 deletions
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index b5995602..d36ff7c2 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -13,13 +13,13 @@
   <? endif ?>
   <li id="g<?= $child->id ?>" class="gItem <?= $album_class ?>">
     <?= $theme->thumb_top($child) ?>
-    <a href="<?= url::site("{$child->type}s/{$child->id}") ?>">
+    <a href="<?= $child->url() ?>">
       <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
            alt="photo" src="<?= $child->thumb_url() ?>"
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
     </a>
-    <h2><a href="<?= url::site("{$child->type}s/{$child->id}") ?>"><?= $child->title ?></a></h2>
+    <h2><a href="<?= $child->url() ?>"><?= $child->title ?></a></h2>
     <?= $theme->thumb_bottom($child) ?>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 88047381..cf7c83b8 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -14,12 +14,12 @@
 </div>
 
 <? if ($position > 1): ?>
-<a href="<?= url::site("{$previous_item->type}s/$previous_item->id") ?>"><?= _("previous") ?></a>
+<a href="<?= $previous_item->url() ?>"><?= _("previous") ?></a>
 <? endif ?>
 <?= sprintf(_("Viewing photo %d of %d"), $position, $sibling_count) ?>
 
 <? if ($position < $sibling_count): ?>
-<a href="<?= url::site("{$next_item->type}s/$next_item->id") ?>"><?= _("next") ?></a>
+<a href="<?= $next_item->url() ?>"><?= _("next") ?></a>
 <? endif ?>
 
 
diff --git a/themes/default/views/tag.html.php b/themes/default/views/tag.html.php
index ac33e092..93cce7e7 100644
--- a/themes/default/views/tag.html.php
+++ b/themes/default/views/tag.html.php
@@ -14,7 +14,7 @@
   <? endif ?>
   <li class="gItem <?= $album_class ?>">
     <?= $theme->thumb_top($child) ?>
-    <a href="<?= url::site("{$child->type}s/{$child->id}") ?>">
+    <a href="<?= $child->url() ?>">
       <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
            alt="photo" src="<?= $child->thumb_url() ?>"
            width="<?= $child->thumb_width ?>"