Fixed bug publishing media published to multiple output channels

Revision

8051

Author

theory

Date

2008-04-15 09:41:30 -0700 (Tue, 15 Apr 2008)

Log Message

Fixed bug publishing media published to multiple output channels with different URIs. Reported by Matt Wlazlo.

Modified Paths

• bricolage/branches/rev_1_10/comp/widgets/help/debuggers.html
• bricolage/branches/rev_1_10/lib/Bric/Changes.pod
• bricolage/branches/rev_1_10/lib/Bric/License.pod
• bricolage/branches/rev_1_10/lib/Bric/Util/Burner.pm

--- bricolage/branches/rev_1_10/comp/widgets/help/debuggers.html	2008-04-15 16:08:02 UTC (rev 8050)
+++ bricolage/branches/rev_1_10/comp/widgets/help/debuggers.html	2008-04-15 16:41:30 UTC (rev 8051)
 -80,4 +80,5 
   <li>Dawn Buie</li>
   <li>Ryan O'Toole<;/li>
   <li>Chauncey Thorn</li>
+  <li>Matt Wlazlo</li>
 </ul>;

--- bricolage/branches/rev_1_10/lib/Bric/Changes.pod	2008-04-15 16:08:02 UTC (rev 8050)
+++ bricolage/branches/rev_1_10/lib/Bric/Changes.pod	2008-04-15 16:41:30 UTC (rev 8051)
 -47,9 +47,15 
 
 =item *
 
-Fixed issue in db_grant.pl which was including the returned row count from the 
-list tables call to be one of the tables to grant permissions to [Paul Orrock]
+Fixed issue in F<db_grant.pl>, which was trying to grant permissions to a row
+count. [Paul Orrock]
 
+=item *
+
+Fixed a bug when publishing or previewing a story with related media where an
+error could occur when a media document was published to more than one output
+channel with different URIs. Reported by Matt Wlazlo. [David]
+
 =back
 
 =head1 VERSION 1.10.4 (2008-03-09)

--- bricolage/branches/rev_1_10/lib/Bric/License.pod	2008-04-15 16:08:02 UTC (rev 8050)
+++ bricolage/branches/rev_1_10/lib/Bric/License.pod	2008-04-15 16:41:30 UTC (rev 8051)
 -438,6 +438,8 
 
 =item * Chauncey Thorn
 
+=item * Matt Wlazlo
+

 =back
 
 Bricolage's translation team:

--- bricolage/branches/rev_1_10/lib/Bric/Util/Burner.pm	2008-04-15 16:08:02 UTC (rev 8050)
+++ bricolage/branches/rev_1_10/lib/Bric/Util/Burner.pm	2008-04-15 16:41:30 UTC (rev 8051)
 -2019,9 +2019,13 
     my ($story, $ext, $ress) = $self->_get(qw(story output_ext resources));
 
     # Create a resource for the distribution stuff.
-    my $res = Bric:ist::Resource->lookup({ path => $file }) ||
-      Bric:ist::Resource->new({ path => $file,
-                                  uri  => $uri });
+    my $res = Bric:ist::Resource->lookup({
+        path => $file,
+        uri  => $uri,
+    }) || Bric:ist::Resource->new({
+        path => $file,
+        uri  => $uri,
+    });
 
     # Set the media type.
     $res->set_media_type(Bric::Util::MediaType->get_name_by_ext($ext));