[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bricolage-commits
Subject:    [6114] s/media/formatting/; -- Damn merge!
From:       theory () bricolage ! cc
Date:       2004-12-26 20:15:47
Message-ID: 20041226201547.5479.qmail () x1 ! develooper ! com
[Download RAW message or body]

Revision: 6114
Author:   theory
Date:     2004-12-26 12:15:46 -0800 (Sun, 26 Dec 2004)
ViewCVS:  http://viewsvn.bricolage.cc/?rev=6114&view=rev

Log Message:
-----------
s/media/formatting/; -- Damn merge!

Modified Files:
--------------
    bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm



["r6114-theory.diff" (r6114-theory.diff)]

Modified: bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm	2004-12-26 20:14:22 UTC (rev 6113)
+++ bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm	2004-12-26 20:15:46 UTC (rev 6114)
@@ -277,7 +277,7 @@
                            . '( SELECT checked_out '
                            . 'FROM formatting_instance '
                            . 'WHERE version = i.version '
-                           . 'AND formatting__id = i.media__id '
+                           . 'AND formatting__id = i.formatting__id '
                            . 'ORDER BY checked_out DESC LIMIT 1 )',
     checked_out           => 'i.checked_out = ?',
     _checked_out          => 'i.checked_out = ?',


[prev in list] [next in list] [prev in thread] [next in thread]