[commits] Horde branch master updated. 93472c5e9f37528e86381b3617a1a830988305a6

[Michael J. Rubinsky]

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

from: e87e93344aa68eced5df1360e9d6830b1ae6a827

5a04dcf fix variable name
0e98ff8 catch exceptions from image operations
df871b8 parse error
d5535cb fix viral parse error
6f6bfbd Migrations cannot rely on the application being available.
93472c5 These charset conversions are not necessary, the data came directly from the DB.

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

commit 5a04dcf3200ce838ca16b9f97d299c05b70bd41f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Oct 17 11:13:56 2011 -0400

    fix variable name

 ansel/templates/image/edit_image.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5a04dcf3200ce838ca16b9f97d299c05b70bd41f

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

commit 0e98ff8dfc1692fbb862edeff99c051cbab50f55
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Oct 17 11:19:09 2011 -0400

    catch exceptions from image operations

 ansel/image.php |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

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

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

commit df871b82261a187aba0042f0958003f8d898432a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Oct 17 11:37:53 2011 -0400

    parse error

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

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

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

commit d5535cb6a1603dd69efa9766f80e4aeace0213d1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Oct 17 11:38:50 2011 -0400

    fix viral parse error

 ansel/image.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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

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

commit 6f6bfbd515056c951ea65b732976f026327770fa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Oct 17 12:25:37 2011 -0400

    Migrations cannot rely on the application being available.

 ansel/migration/10_ansel_upgrade_computestylehashes.php |   28 +++++++++++--
 ansel/migration/3_ansel_upgrade_style.php               |   23 +++++------
 ansel/migration/4_ansel_upgrade_tagstocontent.php       |   31 +++++++++++++--
 ansel/migration/5_ansel_upgrade_categoriestotags.php    |   25 ++++++++++-
 4 files changed, 83 insertions(+), 24 deletions(-)

http://git.horde.org/horde-git/-/commit/6f6bfbd515056c951ea65b732976f026327770fa

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

commit 93472c5e9f37528e86381b3617a1a830988305a6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Oct 17 12:26:49 2011 -0400

    These charset conversions are not necessary, the data came directly from the DB.

 kronolith/migration/18_kronolith_upgrade_categoriestotags.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/93472c5e9f37528e86381b3617a1a830988305a6