diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-09-21 21:29:13 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-09-21 21:29:13 -0700 |
| commit | e5a78d39ec49332054cbc1a398d7c110e1d9191c (patch) | |
| tree | c2acb4731a381b7a1b28fa5ed505a76adb23a3ef /themes/default/views/page.html.php | |
| parent | 529ded3388673036314eefd5bfb1cfc0b76f7f9e (diff) | |
| parent | 33690a32bcf132e5ab470ff77ba23c073ac26271 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/controllers/albums.php
Diffstat (limited to 'themes/default/views/page.html.php')
| -rw-r--r-- | themes/default/views/page.html.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 733534ea..19d8cc00 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -95,7 +95,12 @@ <ul class="gBreadcrumbs"> <? foreach ($parents as $parent): ?> <li> - <a href="<?= $parent->url("show={$theme->item()->id}") ?>"> + <!-- Adding ?show=<id> causes Gallery3 to display the page + containing that photo. For now, we just do it for + the immediate parent so that when you go back up a + level you're on the right page. --> + <a href="<?= $parent->url($parent == $theme->item()->parent() ? + "show={$theme->item()->id}" : null) ?>"> <?= html::purify($parent->title) ?> </a> </li> |