Avoid expired aliases in best_uri()

[#144 state:resolved]
bricoleurs · Mar 10, 2010 · 2ea3cfa · 2ea3cfa
1 parent e8f5253
commit 2ea3cfa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/comp/widgets/help/debuggers.html b/comp/widgets/help/debuggers.html
@@ -90,4 +90,5 @@
   <li>Krzysztof Rudnik</li>
   <li>Adam Wilson</li>
   <li>Iván Chavero</li>
+  <li>Zdravko Balorda</li>
 </ul>
diff --git a/lib/Bric/Changes.pod b/lib/Bric/Changes.pod
@@ -157,6 +157,12 @@ The simple search in workflows no longer disables navigation links on the same
 horizontal line as the "Search" button. Thanks to Matt Rolf for the report
 (Bug # 141) and to Marshall for the CSS jujitsu. [David]
 
+=item *
+
+The C<best_uri()> method of L<Bric::Util::Burner> now avoids expired stories
+when searching for aliased stories. Thanks to Zdravko Balorda for the catch
+(Bug #144). [David]
+
 =back
 
 =head1 Version 1.11.3 (2010-01-28)

diff --git a/lib/Bric/License.pod b/lib/Bric/License.pod
@@ -486,6 +486,8 @@ Friends who have spotted bugs include:
 
 =item * Iván Chavero
 
+=item * Zdravko Balorda
+
 =back
 
 Bricolage's translation team:

diff --git a/lib/Bric/Util/Burner.pm b/lib/Bric/Util/Burner.pm
@@ -1941,6 +1941,7 @@ sub best_uri {
     } else {
         # The asset's not in this site. Try to lookup an alias in this site.
         if (my $rel = $ba->lookup({ alias_id => $ba->get_id,
+                                    unexpired => 1,
                                     site_id  => $site_id })) {
             # Use the alias, instead.
             $ba = $rel;