Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

A fix for the short-lived bug 251 #22

Closed
wants to merge 67 commits into from

5 participants

@bretdawson

Hi everybody,

This commit is a change to the find_or_create_alternate() method, to fix a problem that appears when a media document has a mixed-case filename but an upper- or lower-case URI format.

Cheers,

Bret

theory and others added some commits
@theory theory Increment version to 2.0.1. 0856761
@theory theory Tweak Changes. c1544a0
@theory theory Put the 2.0.1 header in the right place. f645daa
@theory theory Merge 1.10 changes. 843c950
@theory theory Fix Bric::Util::ApacheReq test failures.
Fixe bug in the Bric::Util::ApacheReq tests where they would fail if the
`LISTEN_PORT` or `SSL_PORT` `bricolage.conf` directives were anything other
than 80 and 443, respectively. Thanks to Héctor Daniel Cortés González for the
report.
0266194
@theory theory Add `SKIP_SSL_REDIRECT` directive.
This directive prevents Bricolage from redirecting to and from an SSL URL when
`SSL_ENABLE` is turned on. The case for this is when Bricolage is running
behind a reverse proxy server that's handling SSL mappsings. Thanks to Alex
Krohn for the report.
182dbfd
@theory theory Add "object" date format.
This is so that one can easily get a DateTime object for a date value,
rather than a string.
fc9374f
@theory theory Move change to proper place. 3c17c86
@theory theory Remove redundant line. fc9d361
@rolfm rolfm Fixed SFTP mover bug that would leave escaped tmp files on the destin…
…ation server.
2983408
@theory theory Refactor Bric::Util::Trans::SFTP.
It was a bit of a mess. Much of the code was unnecessary, dating from before
2.0 when it used Net::SFTP instead of Net::SSH2. As a result, the error
handling was all wrong.

While at it, remove the file name escaping, as with newer versions of
Net::SSH2 at least (or perhaps newer versions of libssh2), it was leaving the
backslashes in the file names on the destination server. So bump up the
minimum version of Net::SSH2.

For sanity, also add tests to make sure that Net::Util::Trans::SFTP and
Net::Util::Trans::SFTP compile and have apprpropriate interfaces.
e3e528c
@theory theory Don't deactivate assets while updating via SOAP.
I've no idea why they were able temporarily disabled to begin with. Seemed an
unnecessary defense against something or other. And the downside was
discovered with the addition of the `EXPIRE_ON_DEACTIVATE` directive:
assets were getting expired every time they were updated via SOAP! So
change the code to only activate or deactivate if requested.
0b6ef0e
@theory theory Only pass key and auth information if provided. 113b752
@theory theory Work around Net::SSH2 socket bug. 06d0f77
@theory theory Support Apache MPMs other than prefork.
[#188 state:resolved]
ea4c643
@theory theory Preven Net::FTPServer limits.
They lead to mysterious crashes.
c9fd33a
@theory theory Fix thinko: s/burn_another/publish_another/g 3b0537c
@theory theory exclude .gitignore from exports. 52e6ddc
@theory theory Use currently-checked out asset for diff.
If the "to" choice is the same version as the currently-checked out version,
use the currently-checked out representation. This is so we can see changes
since the checkout.

This is not ideal, frankly, as it's a bit magical. We should consider
modifying the functionality for 2.2 so that there is another choice for
currently-checked out items, "Current version" or something. When that's
selected, the currently-checked out version should be used (for "to" or
"from"). Otherwise, use the checked-in version. I think this would be less
surprising.

Conflicts:

	lib/Bric/Changes.pod
9e4a1af
Kahil Jallad Fix for checkout button showing regardless of perms 5fbe52e
@theory theory Credit kjallad.
Conflicts:

	lib/Bric/Changes.pod
f1e575f
@theory theory Use Kahil's full name. 0457aab
@theory theory Sync changes with master. 374a290
@theory theory Fix POD nerble. 5d325ac
@theory theory Fixed bug in bric_ftpd where the ftp PWD command returns an incorrect
path (missing the site name).  Some ftp clients (eg. FileZilla) call PWD
and use this path after changing directories.

Conflicts:

	lib/Bric/Changes.pod
e764714
@theory theory Fix for displaying desk asset counts. (Bug #198)
From commit e317d9b by Marshall Roch and Alex Howarth.

Conflicts:

	lib/Bric/Changes.pod
5865876
@gregheo gregheo Fix for keyword autocomplete (Bug #206) af37917
@gregheo gregheo Fix for date checking on asset search (Bug #211) fe25f92
@theory theory Don't update publish status on publish failure.
Or, more specifically, revert it to what it was before. If a story hasn't been
published before, then on publish failure the publish status will be false and
the publish date and first publishd date will be `undef`. If it *has* been
published before, then the publish date will not be udpated. This has been an
issue for a long time, so I'll backpatch all the way to 1.10.x.
48df296
@theory theory Remove irrelevant changes.
These apply only to 2.1.0, not 2.0.1, which is what is in this branch.
c7c9593
@theory theory Skip SFTP tests if Net:SSH2 not installed. b2c1721
@theory theory Restore bug fix change note. df44209
@theory theory Fix Xinha.
Update the JavaScript code to only load the editors when they're made visible.
This is a little fragile, since if we change the structure of the HTML at all,
we'll need to make sure that the Xinha code is updated to take advantage of
the new structure. That is, CSS selectors passed to `Element.select()` would
need to be updated.

Not sure if htmlArea or FCKEditor need to be updated, as well. [#217 state:resolved].
7d9e377
@theory theory Give credit where credit is due. 657ce14
@theory theory New URL for FCKeditor. 86db2f3
Phillip Smith Fix placement of Publish/Checkout buttons in their bounding box.
[#194 state:resolved]
d57c3da
@theory theory Typos. 7dd762e
@theory theory Find Apache 2 `Include`d conf files by relative path.
[#174 state:resolved]
909f8eb
@gregheo gregheo Fix for id param on related story lists.
[#183 state:resolved]
9169d3b
@nlegg nlegg Fixed a typo: put_res() and del_res() now call the correct method. 11ca5ab
Phillip Smith Fixed styling of popup menu for Check In and Move actions.
[#193 state:resolved]
82c0988
Phillip Smith Fix for Xinha editor when using the Creat Link button (which was prev…
…iously hidden, not it shows). [#180 state:resolved] [Phillip Smith]
f8a3146
@theory theory Credit Phillip. c60c158
@theory theory Properly sort by Content Type in Element Type manager
Done by adding a new `my_meths` key in Bric::Biz::ElementType that returns the
name. This is to avoid transforming the element type business class ID in
listManager, because that transformation happens before the value is
transformed. [#190 state:resolved].
d0f1cb6
@theory theory Note the fix to the sorting of content type. d54b7aa
Phillip Smith Fix to limit the length of category descriptions (Bug #215). [Phillip…
… Smith] [#215 state:resolved]
8392470
@theory theory Credit where credit is due. 3e72e76
@theory theory Restore category recall to new asset pages.
Before we had autocompletion of categories in the New Story/Media/Template
profiles, it used to be that they would remember the last category selected
when you go to create a new document. That was lost; so restore it.

Done by adding a new widget, `comp/widgets/profile/autocomplete.mc`, which
munges the memorization code from the `select_object` widget with the simple
population of a text filed in `text.mc`. Also a callback that handles
remembering the value when a form is submitted. That callback, of course, is
Bric::App::Callback::Autopopulate.

[#159 state:resolved]
84b739a
@theory theory Note autocomplete memory improvement. 97be5c5
@theory theory Initially hide the dialog box.
Broken in 76bc8da.
4e7eaff
@theory theory Don't reactivate element template when creating category template.
Done by adding `tplate_type` to the search for existing templates. Needed to
add support for that parameter to `Bric::Bus::Asset::Template->list()`.
[#195 state:resolved]
4008864
@theory theory Note template reactivation fix. 217bc40
@theory theory Show template subelement keys in view mode, too.
[#228 state:resolved]
76907fd
@theory theory Note addition of subelements to template view. e123b7a
@gregheo gregheo Return only active subelements (bug #230) b905326
@theory theory Credit Greg with the deactivated element type fix. 5549492
@nlegg nlegg Fixed #201: Deactived assets still have "Republish" checkbox in UI wh…
…en using "Find Stories"
e85e210
@theory theory Note disabling of publish checkbox for disabled assets. 45b0c0f
@theory theory Credit Nick. 270b2fd
@theory theory Make media category browser buttons work again.
Complements 6c8f371, which did the same
for stories. Thanks to Herring for the spot!
d2238d8
@theory theory Thanks Michael Herring. 7b55a86
Zdravko Balorda Fix #212: OC lists for media and story follows site context
This is a suggested fix as Phillip asked. In Bricolage 2.0 stories
and media profiles listed all output channels for users to associate
their documents, instead of only OC associated to the working site only.
bdb2e6a
@theory theory Credit Zdravko Balorda for fixing Bug # 212.
[#212 state:resolved]
a98bc7d
@bretdawson bretdawson Added date and changed version to 2.0.1. c0772dd
@bretdawson bretdawson Merge branch 'rev-2.0' of git://github.com/bricoleurs/bricolage
Conflicts:
	README
	inst/versions.txt
	lib/Bric.pm
	lib/Bric/Changes.pod
922347f
@bretdawson bretdawson Merge branch 'master' of git://github.com/bricoleurs/bricolage 40eced6
@bretdawson bretdawson Fixed bug where mixed-case files did not play nicely with automatic t…
…humbailing for lowercase URIs.
650baa3
@theory
Owner

Thanks. I took a someone different approach to solving this issue in 5fc075a. Please give it a try to verify that it works as expected for you.

@theory theory closed this
@bretdawson
@theory
Owner
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 11, 2010
  1. @theory

    Increment version to 2.0.1.

    theory authored
Commits on Apr 12, 2010
  1. @theory

    Tweak Changes.

    theory authored
  2. @theory
  3. @theory

    Merge 1.10 changes.

    theory authored
  4. @theory

    Fix Bric::Util::ApacheReq test failures.

    theory authored
    Fixe bug in the Bric::Util::ApacheReq tests where they would fail if the
    `LISTEN_PORT` or `SSL_PORT` `bricolage.conf` directives were anything other
    than 80 and 443, respectively. Thanks to Héctor Daniel Cortés González for the
    report.
Commits on Apr 14, 2010
  1. @theory

    Add `SKIP_SSL_REDIRECT` directive.

    theory authored
    This directive prevents Bricolage from redirecting to and from an SSL URL when
    `SSL_ENABLE` is turned on. The case for this is when Bricolage is running
    behind a reverse proxy server that's handling SSL mappsings. Thanks to Alex
    Krohn for the report.
Commits on May 7, 2010
  1. @theory

    Add "object" date format.

    theory authored
    This is so that one can easily get a DateTime object for a date value,
    rather than a string.
  2. @theory

    Move change to proper place.

    theory authored
  3. @theory

    Remove redundant line.

    theory authored
Commits on Jun 5, 2010
  1. @rolfm @theory

    Fixed SFTP mover bug that would leave escaped tmp files on the destin…

    rolfm authored theory committed
    …ation server.
Commits on Jul 6, 2010
  1. @theory

    Refactor Bric::Util::Trans::SFTP.

    theory authored
    It was a bit of a mess. Much of the code was unnecessary, dating from before
    2.0 when it used Net::SFTP instead of Net::SSH2. As a result, the error
    handling was all wrong.
    
    While at it, remove the file name escaping, as with newer versions of
    Net::SSH2 at least (or perhaps newer versions of libssh2), it was leaving the
    backslashes in the file names on the destination server. So bump up the
    minimum version of Net::SSH2.
    
    For sanity, also add tests to make sure that Net::Util::Trans::SFTP and
    Net::Util::Trans::SFTP compile and have apprpropriate interfaces.
Commits on Jul 7, 2010
  1. @theory

    Don't deactivate assets while updating via SOAP.

    theory authored
    I've no idea why they were able temporarily disabled to begin with. Seemed an
    unnecessary defense against something or other. And the downside was
    discovered with the addition of the `EXPIRE_ON_DEACTIVATE` directive:
    assets were getting expired every time they were updated via SOAP! So
    change the code to only activate or deactivate if requested.
Commits on Jul 9, 2010
  1. @theory
Commits on Jul 14, 2010
  1. @theory
Commits on Jul 29, 2010
  1. @theory

    Support Apache MPMs other than prefork.

    theory authored
    [#188 state:resolved]
  2. @theory

    Preven Net::FTPServer limits.

    theory authored
    They lead to mysterious crashes.
  3. @theory
Commits on Oct 24, 2010
  1. @theory
Commits on Nov 2, 2010
  1. @theory

    Use currently-checked out asset for diff.

    theory authored
    If the "to" choice is the same version as the currently-checked out version,
    use the currently-checked out representation. This is so we can see changes
    since the checkout.
    
    This is not ideal, frankly, as it's a bit magical. We should consider
    modifying the functionality for 2.2 so that there is another choice for
    currently-checked out items, "Current version" or something. When that's
    selected, the currently-checked out version should be used (for "to" or
    "from"). Otherwise, use the checked-in version. I think this would be less
    surprising.
    
    Conflicts:
    
    	lib/Bric/Changes.pod
  2. @theory

    Fix for checkout button showing regardless of perms

    Kahil Jallad authored theory committed
  3. @theory

    Credit kjallad.

    theory authored
    Conflicts:
    
    	lib/Bric/Changes.pod
  4. @theory

    Use Kahil's full name.

    theory authored
  5. @theory

    Sync changes with master.

    theory authored
  6. @theory

    Fix POD nerble.

    theory authored
Commits on Nov 5, 2010
  1. @theory

    Fixed bug in bric_ftpd where the ftp PWD command returns an incorrect

    theory authored
    path (missing the site name).  Some ftp clients (eg. FileZilla) call PWD
    and use this path after changing directories.
    
    Conflicts:
    
    	lib/Bric/Changes.pod
  2. @theory

    Fix for displaying desk asset counts. (Bug #198)

    theory authored
    From commit e317d9b by Marshall Roch and Alex Howarth.
    
    Conflicts:
    
    	lib/Bric/Changes.pod
  3. @gregheo @theory

    Fix for keyword autocomplete (Bug #206)

    gregheo authored theory committed
  4. @gregheo @theory

    Fix for date checking on asset search (Bug #211)

    gregheo authored theory committed
Commits on Dec 2, 2010
  1. @theory

    Don't update publish status on publish failure.

    theory authored
    Or, more specifically, revert it to what it was before. If a story hasn't been
    published before, then on publish failure the publish status will be false and
    the publish date and first publishd date will be `undef`. If it *has* been
    published before, then the publish date will not be udpated. This has been an
    issue for a long time, so I'll backpatch all the way to 1.10.x.
  2. @theory

    Remove irrelevant changes.

    theory authored
    These apply only to 2.1.0, not 2.0.1, which is what is in this branch.
  3. @theory
  4. @theory

    Restore bug fix change note.

    theory authored
Commits on Dec 9, 2010
  1. @theory

    Fix Xinha.

    theory authored
    Update the JavaScript code to only load the editors when they're made visible.
    This is a little fragile, since if we change the structure of the HTML at all,
    we'll need to make sure that the Xinha code is updated to take advantage of
    the new structure. That is, CSS selectors passed to `Element.select()` would
    need to be updated.
    
    Not sure if htmlArea or FCKEditor need to be updated, as well. [#217 state:resolved].
  2. @theory
  3. @theory

    New URL for FCKeditor.

    theory authored
Commits on Jan 17, 2011
  1. @theory

    Fix placement of Publish/Checkout buttons in their bounding box.

    Phillip Smith authored theory committed
    [#194 state:resolved]
  2. @theory

    Typos.

    theory authored
  3. @theory

    Find Apache 2 `Include`d conf files by relative path.

    theory authored
    [#174 state:resolved]
  4. @gregheo @theory

    Fix for id param on related story lists.

    gregheo authored theory committed
    [#183 state:resolved]
  5. @nlegg @theory
  6. @theory

    Fixed styling of popup menu for Check In and Move actions.

    Phillip Smith authored theory committed
    [#193 state:resolved]
  7. @theory

    Fix for Xinha editor when using the Creat Link button (which was prev…

    Phillip Smith authored theory committed
    …iously hidden, not it shows). [#180 state:resolved] [Phillip Smith]
  8. @theory

    Credit Phillip.

    theory authored
  9. @theory

    Properly sort by Content Type in Element Type manager

    theory authored
    Done by adding a new `my_meths` key in Bric::Biz::ElementType that returns the
    name. This is to avoid transforming the element type business class ID in
    listManager, because that transformation happens before the value is
    transformed. [#190 state:resolved].
  10. @theory
  11. @theory

    Fix to limit the length of category descriptions (Bug #215). [Phillip…

    Phillip Smith authored theory committed
    … Smith] [#215 state:resolved]
  12. @theory

    Credit where credit is due.

    theory authored
Commits on Jan 18, 2011
  1. @theory

    Restore category recall to new asset pages.

    theory authored
    Before we had autocompletion of categories in the New Story/Media/Template
    profiles, it used to be that they would remember the last category selected
    when you go to create a new document. That was lost; so restore it.
    
    Done by adding a new widget, `comp/widgets/profile/autocomplete.mc`, which
    munges the memorization code from the `select_object` widget with the simple
    population of a text filed in `text.mc`. Also a callback that handles
    remembering the value when a form is submitted. That callback, of course, is
    Bric::App::Callback::Autopopulate.
    
    [#159 state:resolved]
  2. @theory
  3. @theory

    Initially hide the dialog box.

    theory authored
    Broken in 76bc8da.
  4. @theory

    Don't reactivate element template when creating category template.

    theory authored
    Done by adding `tplate_type` to the search for existing templates. Needed to
    add support for that parameter to `Bric::Bus::Asset::Template->list()`.
    [#195 state:resolved]
  5. @theory

    Note template reactivation fix.

    theory authored
  6. @theory

    Show template subelement keys in view mode, too.

    theory authored
    [#228 state:resolved]
  7. @theory
  8. @gregheo @theory

    Return only active subelements (bug #230)

    gregheo authored theory committed
  9. @theory
  10. @nlegg @theory

    Fixed #201: Deactived assets still have "Republish" checkbox in UI wh…

    nlegg authored theory committed
    …en using "Find Stories"
  11. @theory
  12. @theory

    Credit Nick.

    theory authored
Commits on Jan 26, 2011
  1. @theory

    Make media category browser buttons work again.

    theory authored
    Complements 6c8f371, which did the same
    for stories. Thanks to Herring for the spot!
  2. @theory

    Thanks Michael Herring.

    theory authored
  3. @theory

    Fix #212: OC lists for media and story follows site context

    Zdravko Balorda authored theory committed
    This is a suggested fix as Phillip asked. In Bricolage 2.0 stories
    and media profiles listed all output channels for users to associate
    their documents, instead of only OC associated to the working site only.
  4. @theory

    Credit Zdravko Balorda for fixing Bug # 212.

    theory authored
    [#212 state:resolved]
Commits on Feb 6, 2011
  1. @bretdawson
  2. @bretdawson

    Merge branch 'rev-2.0' of git://github.com/bricoleurs/bricolage

    bretdawson authored
    Conflicts:
    	README
    	inst/versions.txt
    	lib/Bric.pm
    	lib/Bric/Changes.pod
Commits on Apr 10, 2011
  1. @bretdawson
  2. @bretdawson

    Fixed bug where mixed-case files did not play nicely with automatic t…

    bretdawson authored
    …humbailing for lowercase URIs.
This page is out of date. Refresh to see the latest.
Showing with 116 additions and 1 deletion.
  1. +5 −0 lib/Bric/Biz/Asset/Business/Media/Image.pm
  2. +111 −1 lib/Bric/Changes.pod
View
5 lib/Bric/Biz/Asset/Business/Media/Image.pm
@@ -55,6 +55,7 @@ use Bric::Config qw(:media :thumb);
use Bric::App::Util ();
use Bric::App::Event ();
use Bric::Biz::Workflow qw(MEDIA_WORKFLOW);
+use Bric::Biz::OutputChannel qw(MIXEDCASE LOWERCASE UPPERCASE);
use Bric::Util::Priv::Parts::Const qw(:all);
use Bric::Util::Fault qw(throw_error throw_gen throw_forbidden);
use Imager;
@@ -540,6 +541,10 @@ sub find_or_create_alternate {
# a hack, but it's the cleanest way to do it without creating
# unnecesary pain.
local $self->{_element_type_object} = $et;
+ my $uri_case = $self->get_primary_oc->get_uri_case;
+ $image_fn = $uri_case == LOWERCASE ? lc $image_fn
+ : $uri_case == UPPERCASE ? uc $image_fn
+ : $image_fn;
(my $u = URI::Escape::uri_unescape($self->get_uri($self->get_primary_oc)))
=~ s{\Q$image_fn\E$}{$alt_fn};
$u;
View
112 lib/Bric/Changes.pod
@@ -8,6 +8,7 @@ Bric::Changes - Bricolage Changes
This document lists the Changes to Bricolage introduced with each release.
+<<<<<<< HEAD
=head1 Version 2.1.0 ()
=head2 New Features
@@ -110,6 +111,8 @@ its publish status, date, and first publish date updated (Bug #200). [David]
=back
+=======
+>>>>>>> a98bc7d303403146fbdbfec255165aaa066746fc
=head1 Version 2.0.1 ()
=head2 Improvements
@@ -141,6 +144,23 @@ the backslashes in the file names. [David]
Bricolage now supports Apache 2 MPMs other than Prefork. YMMV (Bug #188).
[David]
+<<<<<<< HEAD
+=======
+=item *
+
+The "Category" autocompleting field in the New Story/Media/Template profile
+now remembers the last value selected for that screen within the current
+session. This makes it one bit easier to create a bunch of objects in a row
+all in the same category, as used to be the case before 2.0 turned these into
+autocompleting fields (Bug #159). [David]
+
+=item *
+
+The lists of the container and field subelement key names in a template are
+now displayed above the code in the read view as well as the edit view.
+Suggested by Phillip Smith (Bug #228). [David]
+
+>>>>>>> a98bc7d303403146fbdbfec255165aaa066746fc
=back
=head2 Bug Fixes
@@ -216,6 +236,96 @@ story and media profiles (Bug #206). [Greg Heo]
Fixed a bug where some valid date ranges would be rejected as invalid when
searching for assets. (Bug #211). [David Oliveira]
+<<<<<<< HEAD
+=======
+=item *
+
+Fixed bug in bric_ftpd where the ftp PWD command returns an incorrect path
+(missing the site name). Some ftp clients (eg. FileZilla) call PWD and use
+this path after changing directories. [Adrian Yee]
+
+=item *
+
+In the event of a publish failure, a story and media document no longer has
+its publish status, date, and first publish date updated (Bug #200). [David]
+
+=item *
+
+Xinha now works properly, as the WYSIWYG fields are now created only when
+they're displayed (they didn't work right when they were created while
+hidden). Thanks to Aaron Fuleki and Denison University for the report and
+Phillip Smith for finding the relevant Xinha support explaining the problem
+(Bug # 217). [David]
+
+=item *
+
+Adjusted placement of the Checkout and Publish buttons in search results and
+elsewhere so that they're not so close to the border of the box that contains
+them (Bug #194). [Phillip Smith]
+
+=item *
+
+The Apache 2 detection during installation now properly finds C<Include>d
+configuration files specified with paths relative to the C<HTTPD_ROOT> (Bug
+#174). [Michael Herring]
+
+=item *
+
+Using pagination controls when selecting from a list of stories to relate no
+longer throws an error (Bug #183). [Greg Heo]
+
+=item *
+
+Adjusted style of Check In and Move popup menu. Allows for easier selection of
+appropriate action
+
+=item *
+
+Fixed the Xinha editor when using the Create Link button (Bug #180). [Phillip
+Smith]
+
+=item *
+
+The "Content Type" column in the Element Type manager will now properly sort
+when you click its header (Bug #190). [David]
+
+=item *
+
+Bricolage no longer throws an error when the description of a category is
+longer than 256 characters. Thanks to Vladimir for the report (Bug # 215).
+[Phllip Smith]
+
+=item *
+
+Attempting to create a category template that already exists in a category and
+output channel no longer reactivates an element type template (Bug # 195).
+[David]
+
+=item *
+
+Deactivated element types no longer appear as available to add to stories,
+though existing elements of those types will remain unless they're
+individually deleted (Bug #230). [Greg Heo]
+
+=item *
+
+Document and template search results no longer provide a "Republish" checkbox
+for deactivated assets, which are shown when "Include deleted" checkbox is
+selected in the advanced search interface (Bug #201). [Nick Legg]
+
+=item *
+
+The buttons once again work in the media document category browser when the
+C<ENABLE_CATEGORY_BROWSER> F<bricolage.conf> directive is true. Thanks to
+Michael Herring for the report (Bug #155). [David]
+
+=item *
+
+The story and media profiles now allow only output channels associated with
+the site the document element type is associated with to be associated with
+the story or media document (Bug # 212). [Zdravko Balorda]
+
+>>>>>>> a98bc7d303403146fbdbfec255165aaa066746fc
=back
=head1 Version 2.0.0 (2010-04-12)
@@ -236,7 +346,7 @@ recent versions of Apache::Session. [Dave Rolsky]
=item *
-The buttons once again work in the category browser when the
+The buttons once again work in the story document category browser when the
C<ENABLE_CATEGORY_BROWSER> F<bricolage.conf> directive is true. Thanks to
Krzysztof Rudnik for the report (Bug #155). [David]
Something went wrong with that request. Please try again.