[commits] Horde branch develop updated. bda458ac9c847554f1c52a315bc3cda8e563a335

[Michael M Slusarz]

The branch "develop" has been updated.
The following is a summary of the commits.

from: a197d676eb99abf38f46425ba06097108aa9617e

c5859ab The default type is "new".
e8eeb4a Re-add leading paragraph before HTML signature that got lost along the way.
9e774df Avoid undefined variable notices on Ajax updates.
761df9a "Standard" => "English" for the non-metric units choice.
48142c1 Bing does not require an API key
a10b972 [mms] SECURITY: Fix XSS vulnerability on the dynamic compose page.
0ada1c3 XSS fixes for the minimal mailbox and message pages
bda458a Merge branch 'master' into develop

-----------------------------------------------------------------------

commit c5859ab6e653f24a370b041e5bb8ddc6cac65b55
Author: Jan Schneider <jan at horde.org>
Date:   Fri May 4 18:40:30 2012 +0200

    The default type is "new".
    
    Use RTE editor even if not passing type parameter.

 imp/compose-dimp.php |    1 +
 imp/docs/CHANGES     |    1 +
 imp/package.xml      |    2 ++
 3 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/c5859ab6e653f24a370b041e5bb8ddc6cac65b55

-----------------------------------------------------------------------

commit e8eeb4a43797b696a121bc7cd0923a7eca30e31b
Author: Jan Schneider <jan at horde.org>
Date:   Fri May 4 19:15:15 2012 +0200

    Re-add leading paragraph before HTML signature that got lost along the way.

 imp/docs/CHANGES           |    2 ++
 imp/lib/Prefs/Identity.php |    2 +-
 imp/package.xml            |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/e8eeb4a43797b696a121bc7cd0923a7eca30e31b

-----------------------------------------------------------------------

commit 9e774df017bcc60f2a76bfd7484cadfb406ac760
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon May 7 13:46:28 2012 -0400

    Avoid undefined variable notices on Ajax updates.

 horde/lib/Block/Weather.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/9e774df017bcc60f2a76bfd7484cadfb406ac760

-----------------------------------------------------------------------

commit 761df9a4437f6086e7c4d9b7e2e9901693b1b8c5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon May 7 13:50:54 2012 -0400

    "Standard" => "English" for the non-metric units choice.

 horde/lib/Block/Weather.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/761df9a4437f6086e7c4d9b7e2e9901693b1b8c5

-----------------------------------------------------------------------

commit 48142c1e643e1aa3a31419e245b53d3633f832f7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon May 7 16:04:45 2012 -0400

    Bing does not require an API key

 ansel/lib/Ansel.php |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/48142c1e643e1aa3a31419e245b53d3633f832f7

-----------------------------------------------------------------------

commit a10b9720d78166ddf1795df445d44e4f0be9102b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon May 7 16:13:08 2012 -0600

    [mms] SECURITY: Fix XSS vulnerability on the dynamic compose page.

 imp/compose-dimp.php |    2 +-
 imp/docs/CHANGES     |    1 +
 imp/package.xml      |    2 ++
 3 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/a10b9720d78166ddf1795df445d44e4f0be9102b

-----------------------------------------------------------------------

commit 0ada1c3cf6ed5e6e073124658fbee41bf4a92740
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue May 8 13:38:12 2012 -0600

    XSS fixes for the minimal mailbox and message pages

 imp/docs/CHANGES     |    3 ++-
 imp/mailbox-mimp.php |    6 +++---
 imp/message-mimp.php |    2 +-
 imp/package.xml      |    4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/0ada1c3cf6ed5e6e073124658fbee41bf4a92740

-----------------------------------------------------------------------

commit bda458ac9c847554f1c52a315bc3cda8e563a335
Merge: a197d67 0ada1c3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue May 8 13:48:01 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Prefs/Identity.php
    	imp/mailbox-mimp.php
    	imp/package.xml

 imp/docs/CHANGES     |    3 ++-
 imp/mailbox-mimp.php |    6 +++---
 imp/message-mimp.php |    2 +-
 imp/package.xml      |    4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/bda458ac9c847554f1c52a315bc3cda8e563a335