- Patch #440778 by brianV: coding style fixes and documentation improvements.

4 files changed, 22 insertions, 6 deletions

diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc
index 11866bace..6552f95a0 100644
--- a/modules/upload/upload.admin.inc
+++ b/modules/upload/upload.admin.inc
@@ -2,6 +2,11 @@
 // $Id$
 
 /**
+ * @file
+ * This file creates the administration form for the upload module.
+ */
+
+/**
  * Form API callback to validate the upload settings form.
  */
 function upload_admin_settings_validate($form, &$form_state) {
diff --git a/modules/upload/upload.install b/modules/upload/upload.install
index 6a7765714..b09174afd 100644
--- a/modules/upload/upload.install
+++ b/modules/upload/upload.install
@@ -7,6 +7,11 @@
  */
 
 /**
+ * @file
+ * This is the install file for the upload module.
+ */
+
+/**
  * Implementation of hook_install().
  */
 function upload_install() {
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 513cfecee..c52ea2e69 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -407,7 +407,7 @@ function upload_node_delete($node) {
   if (!is_array($node->files)) {
     return;
   }
-  foreach($node->files as $file) {
+  foreach ($node->files as $file) {
     file_delete($file);
   }
 }
@@ -560,16 +560,16 @@ function _upload_form($node) {
   if (user_access('upload files')) {
     $limits = _upload_file_limits($user);
 
-    $limit_description = t('The maximum size of file uploads is %filesize. ', array('%filesize' => format_size($limits['file_size'])));
+    $limit_description = t('The maximum size of file uploads is %filesize.', array('%filesize' => format_size($limits['file_size']))) . ' ';
     if (!empty($limits['resolution'])) {
       if (image_get_toolkit()) {
-        $limit_description .= t('Images larger than %resolution will be resized. ', array('%resolution' => $limits['resolution']));
+        $limit_description .= t('Images larger than %resolution will be resized.', array('%resolution' => $limits['resolution'])) . ' ';
       }
       else {
-        $limit_description .= t('Images may not be larger than %resolution. ', array('%resolution' => $limits['resolution']));
+        $limit_description .= t('Images may not be larger than %resolution.', array('%resolution' => $limits['resolution'])) . ' ';
       }
     }
-    $limit_description .= t('Only files with the following extensions may be uploaded: %extensions. ', array('%extensions' => $limits['extensions']));
+    $limit_description .= t('Only files with the following extensions may be uploaded: %extensions.', array('%extensions' => $limits['extensions'])) . ' ';
 
     $form['new']['#weight'] = 10;
     $form['new']['upload'] = array(
diff --git a/modules/upload/upload.test b/modules/upload/upload.test
index ffbfd8680..7c07c516d 100644
--- a/modules/upload/upload.test
+++ b/modules/upload/upload.test
@@ -1,6 +1,12 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * This file contains tests for the upload module.
+ */
+
+
 class UploadTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
@@ -125,7 +131,7 @@ class UploadTestCase extends DrupalWebTestCase {
     // extension.
     $html_file = $html_files[1]->filepath;
     $this->uploadFile($node, $html_file);
-    $this->assertNoRaw(t('The specified file %name could not be uploaded.', array('%name' => basename($html_file))), t('File '. $html_file . ' was allowed to be uploaded'));
+    $this->assertNoRaw(t('The specified file %name could not be uploaded.', array('%name' => basename($html_file))), t('File ' . $html_file . ' was allowed to be uploaded'));
   }
 
   /**