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.
Fix thinko: s/burn_another/publish_another/g

Conflicts:

	lib/Bric/Changes.pod
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.
Fix for displaying desk asset counts. (Bug #198)

From commit e317d9b3f2c4f59a6456 by Marshall Roch and Alex Howarth.

Conflicts:

	lib/Bric/Changes.pod

Conflicts:

	lib/Bric/Changes.pod
Fix for keyword autocomplete (Bug #206)
Skip SFTP tests if Net:SSH2 not installed.
Fix for date checking on asset search (Bug #211)
Add ID and UUID fields to advanced asset search.

Suggested by Phillip, ticket #186.
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.

[#200 state:resolved]
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].
New URL for FCKeditor.
Make more story attributes versioned.

Namely `priority`, `expire_date`, and `primary_uri`. Will do some more
for media and template attributes in a bit. [#185 state:resolved]
Make `source__id` versioned, too.
Make more media attributes versioned.

Namely `priority`, `expire_date`, and `source__id`.
Make more template attributes versioned.

Namely `priority`, `expire_date`, `name`, `description`, and `category_id`.
Port versioned attribute changes to MySQL.
Fix placement of Publish/Checkout buttons in their bounding box.

[#194 state:resolved]
- added support for CKeditor

This patch is wywsiwyg editor layer to Bricolage. The CKeditor 3.4.2
is found to be working. Just install the editor in comp/media/widgets
directory in to default subdirectory ckeditor. Change the configuration
bricolage.conf WYSIWYG_EDITOR to ckeditor and you should be ok.

There are two new files:
comp/widgets/wysiwyg/ckeditor.html     like xinha.html
comp/widgets/wysiwyg/ckconfig.js       configuration file for the CKeditor

Two files were modified:
comp/widgets/container_prof/container.html      restarting CKeditor on
                                                page reload
lib/Bric/Admin.pod                    short description on this new Bricolage
                                      feature
Mention CKeditor in bricolage.conf.

Also, give credit and remove the note in Bric::Admin about the related document feature, which has not yet been committed.
Find Apache 2 `Include`d conf files by relative path.

[#174 state:resolved]