Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Apr 29, 2009
@theory theory Merge branch 'rev_1_10' of git:// into…
… rev_1_10
Commits on May 06, 2009
@theory theory Fixed a bug in the new stale file expiration code.
When a story is published but has no files to be distributed, it will inadvertantly pass an empty list to `ANY()`. So I modified the code to skip that part if there are no URIs to search on. Thanks to Paul Hyland for the report.
@theory theory Fixed a bug in the new stale file expiration code.
When a story is published but has no files to be distributed, it will inadvertantly pass an empty list to `ANY()`. So I modified the code to skip that part if there are no URIs to search on. Thanks to Paul Hyland for the report.
Commits on Jul 21, 2009
@gregheo gregheo fix for bug #93 (story version corruption)
Need to clear the session cache data when an asset is checked in via the
desk just as it's done when it's checked in from the profile.

Signed-off-by: David E. Wheeler <>
@gregheo gregheo Changes.pod for bug #93
Signed-off-by: David E. Wheeler <>
@gregheo gregheo fix for bug #93 (story version corruption)
Need to clear the session cache data when an asset is checked in via the
desk just as it's done when it's checked in from the profile.

Signed-off-by: David E. Wheeler <>
@gregheo gregheo Changes.pod for bug #93
Signed-off-by: David E. Wheeler <>
Commits on Aug 17, 2009
@theory theory Merge branch 'rev_1_10' of git:// into…
… rev_1_10
@theory theory Fix POD error in `` b37e8c3
@theory theory A bit more precise fix for Bug # 93
The previous fix (commit 777112) was a bit brute-force, in that it could
delete completely irrelevant data from the session. Whilt it was probably
harmless, I updated it to first check the asset version before removing it
from the session. I also updated the `checkout()` callback in
`Bric::App::Callback::Desk` to clear the asset cache from the session, since
on checkout it needs to be completely reloaded no matter what. Each of these
changes addresses the exhibited bug on its own, but I thought it safer to be a
bit more thorough and precise, in the hopes that we can eliminate some other
cases where users end up with screwed-up documents.
Commits on Aug 28, 2009
@theory theory Backported Bric::Dist::Client fix from master. 3f41c27
Commits on Oct 13, 2009
@theory theory Typo. 9869151
Commits on Oct 17, 2009
@theory theory Backported fix for Bug #82 from master.
* Added `unescape_uri()` to Bric::Util::ApacheUtil.
* Updated the various URI-processing methods in Bric::Util::Trans::FS
  to properly escape or unescape URIs as appropriate.
* Wrote tests for the URI-processing methods in Bric::Util::Trans::FS.
* Fixed `PREVIEW_LOCAL` block in Bric::Util::Burner to convert a URI to a
  directory with the improved `uri_to_dir()` method in Bric::Util::Trans::FS.
* Updated the distribution movers (FS, FTP, and SFTP) to convert from URIs
  to file-system paths. Left WebDAV alone, since it should actually use URIs.
@theory theory This fixed a startup error for a client. 28551d3
Commits on Nov 03, 2009
@theory theory Added test for `published_version`.
It seems to work, despite what I reported in Ticket #77.
@theory theory Passing a false value for the C<published_version> parameter to the C…

method of Bric::Biz::Asset::Business::Story Bric::Biz::Asset::Business::Media,
and Bric::Biz::Asset::Template now works as expected, returning the latest
version of all stories regardless of their publish status, rather than no
stories at all (Bug #1).
@theory theory Add the `sql_type` element to the export of field types from SOAP.
This prevents the SOAP server from having to guess the SQL type of a field
type when updating an element type. Thanks to David Oliveira for the report
(Bug #79).
Commits on Nov 10, 2009
@theory theory Allow template notes to be editable again
Backpatched from master.
@theory theory Include charset in text email parts. 7f9bdee
@theory theory Comment out `AddModule` in `httpd.conf`.
The `AddModule` lines are now commented-out in the `httpd.conf` generated by
the installer. As near as I can tell from my research, this directive hasn't
been relevant for a long time. Since we require 1.3.34 (ca. 2005), It seems
good enough to comment it out and add a note to uncomment them if necessary.

Backported from master.
Commits on Nov 11, 2009
@theory theory Fix element type pagination bug
Paginated results in the element type manager no longer lose top-level element
type results when clicking the links for subsequent pages. Fixed by preventing
the `list()` method of Bric::Biz::ElementType from modifying the parameter
hash passed to it, as the modification was persisting in the list manager's
state. Thanks to Aaron Fuleki for the report and for making the Denison
available to diagnose the problem. [#102 state:resolved]
Commits on Nov 12, 2009
@theory theory Avoid `//` in distribution directory names
This came up as a bug for a client: the FTP distributor was failing when the
destination file name was `/path/to//bricolage/uri/here`. So we remove the
leading `/` from Bricolage URIs to prevent the problem. Not sure if it applies
to SFTP or WebDAV, but it seems prudent to provide the same fix for them.

We could really use some tests for this stuff. Any volunteers?

Backported from master.
Commits on Nov 13, 2009
@theory theory Backported LDAP empty password fix from master. 69aa5d4
Commits on Nov 14, 2009
@theory theory Prevent `Category->list` from modifying params.
As with the bug with element types fixed a few days ago, this was causing
problems for the search interface, where params are stored in the session
cache. If the API is changing the values this mucks things up for subsequent
searches. This manifested in the site column appearing and dissappearing in
the category list search results. Backported from master, and tests added
and a bug thus found fixed. Will patch master with that fix, too.
@theory theory Add `.gitignore` to rev_1_10. c0ba3a5
@theory theory Timestamp for 1.10.8
Also fixed some typos.
@theory theory Increment version number to 1.10.9. 3e66e50
Commits on Nov 27, 2009
@theory theory Support port number in SFTP mover. 6e66a40
Commits on Jan 02, 2010
@theory theory Fix for Bug # 122.
Export the proper year in the first three days of 2010 via SOAP.
Commits on Jan 06, 2010
@theory theory Update PostgreSQL performance links. 1ce0895
Commits on Jan 19, 2010
@davidfoliveira davidfoliveira Fix invalid boolean in Bric::Biz::Contact. b4f0ef8
@theory theory Handle character encoding in the VFTP server.
The virtual FTP server now assumes that template files uploaded to it are
encoded in the user's preferred encoding. So if you have Windows gremlins in
your templates, you can set your Character Set preference to "CP1252" and it
will just work. Thanks to Phillip Smith for the report.
Commits on Jan 28, 2010
@theory theory Ay kant spel. eb66f1c
@theory theory Backport distribution action editing fix.
I don't know why it didn't break rev_1_10, but it's clearly safer not to have two variables with the same name in the same scope.
@theory theory Redirect to full URL.
Backported from master.
@theory theory Disable `UseCanonicalName`
It doesn't seem to have the same effects on Apache 1 as Apache 2 for some reason, but it seems best to be consistent across versions. See 638e34d for details.
@theory theory Avoid `mod_dir` redirect.
By putting a slash at the end of the directory name, we prevent `mod_dir`
from redirecting, thus saving a request. There are probably other places
where this would show up, but not many.
@theory theory Fix POD noogie. 3bb376e
@theory theory Timestamp for 1.10.8.
* Fixed some typos in Bric::Changes.
* Specified that the date formatting bug fix was in exports from the SOAP server.
* Added Iván Chavero to the credits.
Commits on Jan 29, 2010
@theory theory Increment version to 1.10.10. d6191de
@theory theory We need only one Improvements section. 9550249
Commits on Feb 23, 2010
@theory theory Fix workflow forgetting bug.
Bric::Util::Burner's `publish()` method no longer removes documents from workflow after publishing them, as such is the responsbility of the code that calls publish. The publish callback already did, and now so does the Bric::SOAP::Workflow `publish()` method. Thanks to David Beaudet for the report and Aaron Fuleki for the steps to replicate [#98 state:resolved].
@theory theory Separate story and admin search results.
Fix bug where contributor and category search results would be propagated to the contributor and category editing screens with a story or media document. Searches from within documents should cache their own results, separate from the admin search interfaces.
Commits on Feb 25, 2010
@theory theory Disable category and contributor pagination in docs.
This commit fixes a few issues, discovered and fixed in reaction to Bug [#121 state:resolved]:

* When editing contributors associated with a story or media document, they are no longer paginated. When there were more contributors than would fit on a paginated page, the pagination didn't work and reording didn't work. So by disabling pagination in this case, we get around that issue. Documents with that many contributors are rare, so the trade-off seems worthwhile.

* The same turned out to be true for categories when they were displayed and the `ENABLE_CATEGORY_BROWSER` `bricolage.conf` directive was true. So pagination is now diabled there, too.

* While at it, the ordering of categories displayed as such was borked, so I fixed it so that they display in URI order, which is what had been expected in the first place.

* And finally, when associating contriutors with a media document, the user was prompted to select a role, even if there was only one. We now skip that step, as we had been doing with stories for a while now.
@theory theory Improved "Log In" button from Waldo.
Also moved some changes items to the proper version.
@theory theory Oops, POD fix. 2431db8
@theory theory Backport PHP fix from master. 1550440
Commits on Feb 26, 2010
@theory theory Backport read_password improvement from master. c8fea29
@theory theory Change `rm_svn` make target to `rm_git`. dc44137
Commits on Mar 05, 2010
@theory theory s/the the/the/g 8f7c854
Commits on Mar 10, 2010
@theory theory Display source options in alphabetical order.
The Source select list when creating or editing a story or media document now
lists sources in alphabetical order. Reported by Michael Herring
[#138 state:resolved].
@theory theory Avoid expired aliases in `best_uri()` bd98163
Commits on Mar 23, 2010
@theory theory Backport code select validation consistency from master. 337ed87
Commits on Mar 30, 2010
@theory theory Backport protocol/URI fixes from master. a10b087
Commits on Apr 05, 2010
@autarch autarch Newer versions of Apache::Session (1.83+, I believe) throw a differen…
…t error when the session does not yet exist.
@theory theory Backported error handling patch.
Thanks to autarch for reporting the bug. Will backport.
Commits on Apr 11, 2010
@theory theory Don't delete preview files on publish.
This happened for stories in multiple categories -- and probably for stories
with multiple pages, too. The problem was that `not_uri => ANY(@files)` was
doing `(uri NOT LIKE $file OR uri NOT LIKE $file)`. That `OR` need to be an
`AND`. So I fixed the `any_where` function to detect `NOT LIKE` and switch
to an `AND` in that case.

(Just as an aside, I hate that we're parsing SQL bits here, but at least
they're all bits we control in our code).

Thanks to Guido Buelskaemper for the report [#156 state:resolved].
@theory theory Edit changes and timestamp for 1.10.10. a9f57f6
@theory theory Increment version number to 1.10.11. 1939293
Commits on May 07, 2010
@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.
@theory theory Remove redundant line. 51fa697
Commits on Jul 07, 2010
@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! The feature is in
2.0, but it seemed prudent to remove the unnecessary deactivation from 1.10,
too. So change the code to only activate or deactivate if requested.
Commits on Jul 29, 2010
@theory theory Prevent Net::FTPServer limits.
They lead to mysterious crashes.
Commits on Oct 24, 2010
@theory theory exclude .gitignore from exports. bd84f75
Commits on Nov 02, 2010
@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


Commits on Nov 05, 2010
@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.


Commits on Dec 02, 2010
@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.
Commits on Jan 18, 2011
@nlegg nlegg Fixed #201: Deactived assets still have "Republish" checkbox in UI wh…
…en using "Find Stories"
@theory theory Credit Nick. 8231c0d
@theory theory Ignore wysiwyg. 2040f01
@theory theory Credit where credit is due. 4ed5779
Commits on May 11, 2011
@gregheo gregheo Fix overzealous escaping for localization.
Per Locale::Maketext docs, commas only need to be escaped when inside
bracket notation.

[#245 state:resolved]
@theory theory Credit where credit is due. 8cdaf63