From ab9bce1bda5ae2897471e454e9f564cc5072056d Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 12 Mar 2010 12:15:41 -0700 Subject: [PATCH] Fix array key name --- imp/compose-dimp.php | 4 ++-- imp/lib/Views/Compose.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php index c017665eb..ce11c81d8 100644 --- a/imp/compose-dimp.php +++ b/imp/compose-dimp.php @@ -193,8 +193,8 @@ Horde::addInlineScript(array_merge($compose_result['js'], $js)); /* Javascript to be run on window load. */ $fillform_opts['focus'] = ($vars->type == 'new' || $vars->type == 'forward') ? 'to' : 'composeMessage'; -$compose_result['js_onload'][] = 'DimpCompose.fillForm(' . Horde_Serialize::serialize($msg, Horde_Serialize::JSON) . ',' . Horde_Serialize::serialize($header, Horde_Serialize::JSON) . ',' . Horde_Serialize::serialize($fillform_opts, Horde_Serialize::JSON) . ')'; -Horde::addInlineScript($compose_result['js_onload'], 'load'); +$compose_result['jsonload'][] = 'DimpCompose.fillForm(' . Horde_Serialize::serialize($msg, Horde_Serialize::JSON) . ',' . Horde_Serialize::serialize($header, Horde_Serialize::JSON) . ',' . Horde_Serialize::serialize($fillform_opts, Horde_Serialize::JSON) . ')'; +Horde::addInlineScript($compose_result['jsonload'], 'load'); $scripts = array( array('compose-base.js', 'imp'), diff --git a/imp/lib/Views/Compose.php b/imp/lib/Views/Compose.php index e9eb39187..f78e1cc8c 100644 --- a/imp/lib/Views/Compose.php +++ b/imp/lib/Views/Compose.php @@ -52,7 +52,7 @@ class IMP_Views_Compose if ($imp_compose->numberOfAttachments()) { foreach ($imp_compose->getAttachments() as $num => $atc) { $mime = $atc['part']; - $result['js_onload'][] = 'DimpCompose.addAttach(' . $num . ', \'' . addslashes($mime->getName(true)) . '\', \'' . addslashes($mime->getType()) . '\', \'' . addslashes($mime->getSize()) . "')"; + $result['jsonload'][] = 'DimpCompose.addAttach(' . $num . ', \'' . addslashes($mime->getName(true)) . '\', \'' . addslashes($mime->getType()) . '\', \'' . addslashes($mime->getSize()) . "')"; } } } -- 2.11.0