summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelle Sebreghts2012-08-22 15:23:31 (GMT)
committerJelle Sebreghts2012-08-22 15:23:31 (GMT)
commit23ec6e4ded4549bf0d804ae655246583229de9e0 (patch)
treeb2c50d9a35eff604d1990163b84ec3030623a8f2
parent73dd2ae91b933a3190de878a58281e161b75e3b5 (diff)
Issue #1655252 by sah62: Fixed Warning: Invalid argument supplied for foreach().
-rw-r--r--multifile.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/multifile.inc b/multifile.inc
index cb5fc23..5c2f5c6 100644
--- a/multifile.inc
+++ b/multifile.inc
@@ -342,8 +342,8 @@ function theme_webform_edit_multifile($variables) {
* Implementation of _webform_render_component().
*/
function _webform_render_multifile($component, $value = NULL, $filter = TRUE) {
- drupal_add_js(drupal_get_path('module', 'webform_multifile') . '/multifile/jquery.MultiFile.js');
- drupal_add_js(drupal_get_path('module', 'webform_multifile') . '/webform_multifile.js', array('scope' => 'footer'));
+ //drupal_add_js(drupal_get_path('module', 'webform_multifile') . '/multifile/jquery.MultiFile.js');
+ //drupal_add_js(drupal_get_path('module', 'webform_multifile') . '/webform_multifile.js', array('scope' => 'footer'));
$id = 'MultiFile-identifier-' . str_replace('_', '-', $component['form_key']);
$component['extra']['attributes']['class'][] = 'form-item multi ' . $id;
@@ -361,6 +361,8 @@ function _webform_render_multifile($component, $value = NULL, $filter = TRUE) {
'#suffix' => "<div class='outer'><div class='inner'></div></div>",
"#attached" => array(
'js' => array(
+ drupal_get_path('module', 'webform_multifile') . '/multifile/jquery.MultiFile.js' => array('type' => 'file'),
+ drupal_get_path('module', 'webform_multifile') . '/webform_multifile.js' => array('type' => 'file', 'scope' => 'footer'),
"(function ($) { \n" .
// Stores all the settings for each field in an array so the javascript files can load later
" if (typeof MultiFile_fields == 'undefined') {MultiFile_fields = []} \n" .
@@ -657,7 +659,7 @@ function _webform_analysis_multifile($component, $sids = array()) {
$sizetotal = 0;
$submissions = 0;
$numfiles = 0;
-
+
while ($data = $result->fetchAssoc()) {
if ($fids = unserialize($data['data'])) {
$counter = 0;