Changeset 287 for branches/1.1dev/lib

Timestamp:

Oct 21, 2007 1:08:47 AM (17 years ago)

Author:

quinn

Message:

 

File:

• branches/1.1dev/lib/Upload.inc.php (modified) (1 diff)

branches/1.1dev/lib/Upload.inc.php

@@ -371 +371 @@
                 // Single upload.
                 if (isset($custom_file_name)) {
-                    if (is_array($custom_file_name) && sizeof($custom_file_name) == 1) {
+                    if (is_array($custom_file_name) && sizeof($custom_file_name) == 1 && '' != trim($custom_file_name[0])) {
                         // Is an array, but just one value. Pull it out.
-                        $custom_file_name = current($custom_file_name);
+                        $file_name = trim($custom_file_name[0]);
                         raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
                         logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
-                    } else if (!is_array($custom_file_name) && '' != $custom_file_name) {
+                    } else if (!is_array($custom_file_name) && '' != trim($custom_file_name)) {
                         // Valid custom file name.
                         $file_name = $custom_file_name;