[commits] Horde branch master updated. 9942ce2a31c3140d4fc6ccca5d957a65673d202a

[Michael M Slusarz]

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

from: 1ca8d171f292d141f76ebecf028fe2097a2d9616

c16a6e3 Bug #10092: Readd code to view portal, even though it is still disabled
9893e9e Catch bad image data
95012ea Unneeded closing PHP tag
8d51daf Clean up loading of image object
02c193f dl() doesn't exist in PHP 5.3
72bd2e3 IMP favicon with transparent background
9942ce2 Fix line wrapping

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

commit c16a6e31fb0b95aca5a9265916f8f49d50c27d65
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Wed May 18 01:44:08 2011 -0600

    Bug #10092: Readd code to view portal, even though it is still disabled

 imp/js/dimpbase.js                     |    8 ++++++++
 imp/templates/dimp/javascript_defs.php |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)

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

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

commit 9893e9e7fba5d851706c1b2f141ae0cdd6a57e41
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu May 19 09:13:36 2011 -0600

    Catch bad image data

 imp/lib/Mime/Viewer/Images.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/9893e9e7fba5d851706c1b2f141ae0cdd6a57e41

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

commit 95012ea6125b2fe2ed4f19387fd09270c523d69f
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu May 19 09:14:45 2011 -0600

    Unneeded closing PHP tag

 framework/Image/lib/Horde/Image/Exception.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/95012ea6125b2fe2ed4f19387fd09270c523d69f

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

commit 8d51dafdd82a56b378de776fbcb8c60deb7cdc0e
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu May 19 09:24:37 2011 -0600

    Clean up loading of image object

 imp/lib/Mime/Viewer/Images.php |   25 +++++--------------------
 1 files changed, 5 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/8d51dafdd82a56b378de776fbcb8c60deb7cdc0e

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

commit 02c193f096697821b367817eef58445bcdca255c
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu May 19 09:29:01 2011 -0600

    dl() doesn't exist in PHP 5.3

 framework/Util/lib/Horde/Util.php |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/02c193f096697821b367817eef58445bcdca255c

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

commit 72bd2e32c8ceef5e3513f0a18c86149807ba3da3
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu May 19 09:35:06 2011 -0600

    IMP favicon with transparent background
    
    From: Thomas E. Horner <office at t-horner.com>

 imp/themes/default/graphics/favicon.ico |  Bin 1406 -> 1406 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/72bd2e32c8ceef5e3513f0a18c86149807ba3da3

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

commit 9942ce2a31c3140d4fc6ccca5d957a65673d202a
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu May 19 09:37:30 2011 -0600

    Fix line wrapping

 imp/config/prefs.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/9942ce2a31c3140d4fc6ccca5d957a65673d202a