[dev] [commits] Horde branch develop updated. 4093650bf18198848b53b6f823dec9544a8db64e

[Michael M Slusarz]

Quoting "Michael J. Rubinsky" <mrubinsk at horde.org>:

> commit 4093650bf18198848b53b6f823dec9544a8db64e
> Merge: e4c6ee8 bf46a47
> Author: Michael J Rubinsky <mrubinsk at horde.org>
> Date:   Thu Jan 26 17:34:55 2012 -0500
>
>     Merge branch 'master' into develop
>
>     Conflicts:
>     	framework/Core/package.xml
>
>  components/lib/Components.php                  |    4 ++--
>  components/lib/Components/Component/Source.php |   23  
> ++++++++++++++---------
>  components/lib/Components/Helper/ChangeLog.php |    4 ++--
>  components/lib/Components/Module/Change.php    |   18 ++++++++++++++----
>  framework/Core/lib/Horde/Themes/Css.php        |    2 +-
>  framework/Core/package.xml                     |   10 +++++++---
>  imp/docs/CHANGES                               |    1 +
>  imp/mailbox.php                                |    2 +-
>  imp/package.xml                                |    2 ++
>  9 files changed, 44 insertions(+), 22 deletions(-)
>
> http://git.horde.org/horde-git/-/commit/4093650bf18198848b53b6f823dec9544a8db64e

Another major place where we don't have the whole master -> develop  
process down quite yet...

This commit blew away the entire changelog of Core/package.xml.  These  
changes are not ready for primetime yet, so they are not set to get  
pushed out in the package.  That's why Horde_Core is currently marked  
as version 2.0.0 in develop.

Here's what was incorrectly changed:

-* [mjr] Allow restricting pretty autocompleter to available choices.
-* [mms] Add language detection to AJAX spellchecker if no language is  
selected
by the user (Request #7137).
-* [mms] Add Horde_Core_Block_Layout_View::getStylesheets().
+* [mjr] Fix issue with autocompletion that would cause it to fail in  
certain ci
rcumstances (Bug #10904).
+* [mms] Remove trailing semicolon when replacing @import statements.
+* [mjr] Fix issue that could cause failure of ActiveSync due to  
incorrect packi
ng of binary data.
+* [jan] Use separate database connection for SQL session handler (Bug  
#10906).
+* [mms] Fix parsing DB config when using splitread database setup.

Unlike develop applications, there's no other place to put these  
changes in the packages.

michael


___________________________________
Michael Slusarz [slusarz at horde.org]