Changeset 310 for branches/1.1dev/lib

Timestamp:

Jan 31, 2008 9:54:13 AM (16 years ago)

Author:

quinn

Message:

Minor bugfixing. Added some admin css tweaks to 1.1dev.

Location:

branches/1.1dev/lib

Files:

• Email.inc.php (modified) (1 diff)
• Upload.inc.php (modified) (1 diff)

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

@@ -260 +260 @@
         // Ensure all placeholders have been replaced. Find anything with {...} characters.
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
-            logMsg(sprintf('Cannot send email. Variables left unreplaced in template: %s', (isset($unreplaced_match[1]) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
+            logMsg(sprintf('Cannot send email. At least one variable left unreplaced in template: %s', (isset($unreplaced_match[1]) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
             return false;
         }

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

@@ -561 +561 @@
         $file_name = trim($file_name);
         $file_name = strtr($file_name, $bad, $good);
-        $file_name = preg_replace('/[^-\w.,~_=+\(\)]/', '_', $file_name);
+        $file_name = preg_replace('/[^-\w.,~_=+]+/', '_', $file_name);
         $file_name = substr($file_name, 0, 250);
         return $file_name;