summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-05-19 19:33:49 +0000
committerDries Buytaert <dries@buytaert.net>2005-05-19 19:33:49 +0000
commit52c383d2e431fcc5ce4c9548cc2c54325b3ec1bc (patch)
treed786239fa0ba197613409ab5879f8a361fcb7a51
parente7b70296beed93c59f69fe1fc3181d2949c4765f (diff)
downloadbrdo-52c383d2e431fcc5ce4c9548cc2c54325b3ec1bc.tar.gz
brdo-52c383d2e431fcc5ce4c9548cc2c54325b3ec1bc.tar.bz2
- Patch #23160 by drumm: fixed status message by adding a missing string substition.
-rw-r--r--modules/upload.module2
-rw-r--r--modules/upload/upload.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/upload.module b/modules/upload.module
index c0c7c6b86..6e58a6f13 100644
--- a/modules/upload.module
+++ b/modules/upload.module
@@ -207,7 +207,7 @@ function upload_nodeapi(&$node, $op, $arg) {
}
if ($error['extension'] == count($user->roles) && $user->uid != 1) {
- form_set_error('upload', t('The selected file %name can not be attached to this post, because it is only possible to attach files with the following extensions: %files-allowed', array('%files-allowed' => theme('placeholder', $extensions))));
+ form_set_error('upload', t('The selected file %name can not be attached to this post, because it is only possible to attach files with the following extensions: %files-allowed', array('%name' => theme('placeholder', $file->filename), '%files-allowed' => theme('placeholder', $extensions))));
}
elseif ($error['uploadsize'] == count($user->roles) && $user->uid != 1) {
form_set_error('upload', t('The selected file %name can not be attached to this post, because it exceeded the maximum filesize of %maxsize', array('%name' => theme('placeholder', $file->filename), '%maxsize' => theme('placeholder', format_size($uploadsize)))));
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index c0c7c6b86..6e58a6f13 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -207,7 +207,7 @@ function upload_nodeapi(&$node, $op, $arg) {
}
if ($error['extension'] == count($user->roles) && $user->uid != 1) {
- form_set_error('upload', t('The selected file %name can not be attached to this post, because it is only possible to attach files with the following extensions: %files-allowed', array('%files-allowed' => theme('placeholder', $extensions))));
+ form_set_error('upload', t('The selected file %name can not be attached to this post, because it is only possible to attach files with the following extensions: %files-allowed', array('%name' => theme('placeholder', $file->filename), '%files-allowed' => theme('placeholder', $extensions))));
}
elseif ($error['uploadsize'] == count($user->roles) && $user->uid != 1) {
form_set_error('upload', t('The selected file %name can not be attached to this post, because it exceeded the maximum filesize of %maxsize', array('%name' => theme('placeholder', $file->filename), '%maxsize' => theme('placeholder', format_size($uploadsize)))));