* Renamed the album, item and photo controllers to albums, items and photos in order to follow the convention that controllers that refer to a collection of resources have plural names.

* Added a bug workaround to routes.php

2 files changed, 3 insertions, 3 deletions

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index b2617998..18c53d46 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -12,7 +12,7 @@
   <? $album_class = "gAlbum "; ?>
   <? endif ?>
   <li class="gItem <?= $album_class ?>">
-    <a href="<?= url::site("{$child->type}/{$child->id}") ?>">
+    <a href="<?= url::site("{$child->type}s/{$child->id}") ?>">
       <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
            alt="photo" src="<?= $child->thumbnail_url() ?>"
            width="<?= $child->thumbnail_width ?>"
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 03d4357c..1a6a10e8 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -25,7 +25,7 @@
 
 <ul id="gSiteMenu">
   <li><a href="<?= url::base() ?>"><?= _("HOME") ?></a></li>
-  <li><a class="active" href="<?= url::site("album/1") ?>"><?= _("BROWSE") ?></a></li>
+  <li><a class="active" href="<?= url::site("albums/1") ?>"><?= _("BROWSE") ?></a></li>
   <li><a href="#"><?= _("UPLOAD") ?></a></li>
   <li><a href="#"><?= _("MY GALLERY") ?></a></li>
   <li><a href="#"><?= _("ADMIN") ?></a></li>
@@ -40,7 +40,7 @@
 
 <ul id="gBreadcrumbs">
   <? foreach ($parents as $parent): ?>
-  <li><a href="<?= url::site("album/{$parent->id}") ?>"><?= $parent->title_edit ?></a></li>
+  <li><a href="<?= url::site("albums/{$parent->id}") ?>"><?= $parent->title_edit ?></a></li>
   <? endforeach ?>
   <li class="active"><?= $item->title_edit ?></li>
 </ul>