Pass $gallery to Ansel::getBreadCrumbs() whenever possible since otherwise we may...

diff --git a/ansel/img/upload.php b/ansel/img/upload.php
index d490f69..4a87ca2 100644 (file)
--- a/ansel/img/upload.php
+++ b/ansel/img/upload.php
@@ -241,7 +241,7 @@ if ($gallery->countImages() && $browser->hasFeature('javascript')) {
     $haveImages = true;
 }
 
-$breadcrumbs = Ansel::getBreadCrumbs(' » ', $gallery);
+$breadcrumbs = Ansel::getBreadCrumbs($gallery);
 $title = _("Add Photo");
 require ANSEL_TEMPLATES . '/common-header.inc';
 require ANSEL_TEMPLATES . '/menu.inc';

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index 1459156..1be99cb 100644 (file)
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -600,7 +600,7 @@ class Ansel
      *
      * @return string
      */
-    static public function getBreadCrumbs($separator = ' » ', $gallery = null)
+    static public function getBreadCrumbs($gallery = null, $separator = ' » ')
     {
         global $prefs;
 

diff --git a/ansel/templates/view/gallery.inc b/ansel/templates/view/gallery.inc
index 353183a..4eca846 100644 (file)
--- a/ansel/templates/view/gallery.inc
+++ b/ansel/templates/view/gallery.inc
@@ -105,7 +105,7 @@ function downloadSelected()
   <?php echo $this->numTiles > $this->perpage ? sprintf(_("%d to %d of %d items"), $this->pagestart, $this->pageend, $this->numTiles) : sprintf(ngettext("%d item", "%d items", $this->numTiles), $this->numTiles) ?>
   </span>
   <?php endif; ?>
-  <?php echo Ansel::getBreadCrumbs(); ?>
+  <?php echo Ansel::getBreadCrumbs($this->view->gallery) ?>
 </div>
 <?php if ($this->view->gallery->get('desc')): ?>
     <div id="galleryDescription" class="gallery-desc">

diff --git a/ansel/templates/view/gallerylightbox.inc b/ansel/templates/view/gallerylightbox.inc
index b3f05b2..5db59cd 100644 (file)
--- a/ansel/templates/view/gallerylightbox.inc
+++ b/ansel/templates/view/gallerylightbox.inc
@@ -122,7 +122,7 @@ function downloadSelected()
     <?php endif; ?>
 </script>
 <div class="header" id="galleryHeader">
- <?php echo ($this->numTiles ? '<span class="rightFloat">' . ($this->numTiles > $this->perpage ? sprintf(_("%d to %d of %d Items"), $this->pagestart, $this->pageend, $this->numTiles) : sprintf(ngettext("%d Item", "%d Items", $this->numTiles), $this->numTiles)) . '</span>' : '') . Ansel::getBreadCrumbs(); ?>
+ <?php echo ($this->numTiles ? '<span class="rightFloat">' . ($this->numTiles > $this->perpage ? sprintf(_("%d to %d of %d Items"), $this->pagestart, $this->pageend, $this->numTiles) : sprintf(ngettext("%d Item", "%d Items", $this->numTiles), $this->numTiles)) . '</span>' : '') . Ansel::getBreadCrumbs($this->view->gallery) ?>
 </div>
 <?php if ($this->view->gallery->get('desc')): ?>
 <div class="gallery-desc" id="galleryDescription">

diff --git a/ansel/templates/view/image.inc b/ansel/templates/view/image.inc
index 382708b..e137027 100644 (file)
--- a/ansel/templates/view/image.inc
+++ b/ansel/templates/view/image.inc
@@ -47,7 +47,7 @@ function arrowHandler(e)
     }
 }
 </script>
-<h1 class="header" id="PhotoName"><?php echo Ansel::getBreadCrumbs(); ?></h1>
+<h1 class="header" id="PhotoName"><?php echo Ansel::getBreadCrumbs($this->gallery) ?></h1>
 <table style="width: 100%; border-collapse: collapse">
  <tr>
   <td valign="top" style="background-color:<?php echo $this->_style['background']; ?>;">