diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-09-05 15:05:05 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-09-05 15:05:05 +0000 |
| commit | a539b0e00dedddfea36d4a96b788e42923056a78 (patch) | |
| tree | fcf4876cbfa5abef45c40e134b99bc30944fde14 /modules/upload | |
| parent | 2431df84a2a6afb07a5214ef748cded72ac87947 (diff) | |
| download | brdo-a539b0e00dedddfea36d4a96b788e42923056a78.tar.gz brdo-a539b0e00dedddfea36d4a96b788e42923056a78.tar.bz2 | |
- Patch by #565496 by dropcube, pwolanin: changed Allow dynamic attaching of other types of stuff to render() structures.
Diffstat (limited to 'modules/upload')
| -rw-r--r-- | modules/upload/upload.admin.inc | 4 | ||||
| -rw-r--r-- | modules/upload/upload.module | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc index 7d9d14716..759cde460 100644 --- a/modules/upload/upload.admin.inc +++ b/modules/upload/upload.admin.inc @@ -69,8 +69,8 @@ function upload_admin_settings() { '#type' => 'fieldset', '#title' => t('General settings'), '#collapsible' => TRUE, - '#attached_css' => array( - drupal_get_path('module', 'upload') . '/upload.admin.css', + '#attached'=> array( + 'css' => array(drupal_get_path('module', 'upload') . '/upload.admin.css'), ), ); $form['settings_general']['upload_max_resolution'] = array( diff --git a/modules/upload/upload.module b/modules/upload/upload.module index 26a284439..76bc7b2b6 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -231,7 +231,9 @@ function upload_form_alter(&$form, $form_state, $form_id) { '#collapsible' => TRUE, '#collapsed' => empty($node->files), '#group' => 'additional_settings', - '#attached_js' => array(drupal_get_path('module', 'upload') . '/upload.js'), + '#attached' => array( + 'js' => array(drupal_get_path('module', 'upload') . '/upload.js'), + ), '#description' => t('Changes made to the attachments are not permanent until you save this post. The first "listed" file will be included in RSS feeds.'), '#weight' => 30, ); |