Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
drupal
Commits
b9b0063a
Commit
b9b0063a
authored
15 years ago
by
Dries Buytaert
Browse files
Options
Downloads
Patches
Plain Diff
- Patch
#453572
by Xano: improve language.
parent
1eb38eed
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!7452
Issue #1797438. HTML5 validation is preventing form submit and not fully...
,
!789
Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/contact/contact.pages.inc
+3
-3
3 additions, 3 deletions
modules/contact/contact.pages.inc
modules/contact/contact.test
+5
-5
5 additions, 5 deletions
modules/contact/contact.test
with
8 additions
and
8 deletions
modules/contact/contact.pages.inc
+
3
−
3
View file @
b9b0063a
...
...
@@ -92,7 +92,7 @@ function contact_site_form() {
);
$form
[
'submit'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
t
(
'Send
e-mail
'
),
'#value'
=>
t
(
'Send
message
'
),
);
return
$form
;
...
...
@@ -197,7 +197,7 @@ function contact_personal_form(&$form_state, $recipient) {
'#title'
=>
t
(
'Send yourself a copy.'
),
);
$form
[
'submit'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
t
(
'Send
e-mail
'
),
'#value'
=>
t
(
'Send
message
'
),
);
return
$form
;
}
...
...
@@ -229,7 +229,7 @@ function contact_personal_form_submit($form, &$form_state) {
flood_register_event
(
'contact'
);
watchdog
(
'mail'
,
'%name-from sent %name-to an e-mail.'
,
array
(
'%name-from'
=>
$user
->
name
,
'%name-to'
=>
$account
->
name
));
drupal_set_message
(
t
(
'
The
message has been sent.'
));
drupal_set_message
(
t
(
'
Your
message has been sent.'
));
// Back to the requested users profile page.
$form_state
[
'redirect'
]
=
"user/
$account->uid
"
;
...
...
This diff is collapsed.
Click to expand it.
modules/contact/contact.test
+
5
−
5
View file @
b9b0063a
...
...
@@ -204,7 +204,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
$edit
[
'subject'
]
=
$subject
;
$edit
[
'cid'
]
=
$cid
;
$edit
[
'message'
]
=
$message
;
$this
->
drupalPost
(
'contact'
,
$edit
,
t
(
'Send
e-mail
'
));
$this
->
drupalPost
(
'contact'
,
$edit
,
t
(
'Send
message
'
));
}
/**
...
...
@@ -299,8 +299,8 @@ class ContactPersonalTestCase extends DrupalWebTestCase {
$edit
=
array
();
$edit
[
'subject'
]
=
$this
->
randomName
(
16
);
$edit
[
'message'
]
=
$this
->
randomName
(
64
);
$this
->
drupalPost
(
NULL
,
$edit
,
t
(
'Send
e-mail
'
));
$this
->
assertText
(
t
(
'
The
message has been sent.'
),
t
(
'Message sent.'
));
$this
->
drupalPost
(
NULL
,
$edit
,
t
(
'Send
message
'
));
$this
->
assertText
(
t
(
'
Your
message has been sent.'
),
t
(
'Message sent.'
));
// Clear flood table in preparation for flood test and allow other checks to complete.
db_delete
(
'flood'
)
->
execute
();
...
...
@@ -310,8 +310,8 @@ class ContactPersonalTestCase extends DrupalWebTestCase {
// Submit contact form with correct values and check flood interval.
for
(
$i
=
0
;
$i
<
$flood_control
;
$i
++
)
{
$this
->
drupalGet
(
'user/'
.
$web_user2
->
uid
.
'/contact'
);
$this
->
drupalPost
(
NULL
,
$edit
,
t
(
'Send
e-mail
'
));
$this
->
assertText
(
t
(
'
The
message has been sent.'
),
t
(
'Message sent.'
));
$this
->
drupalPost
(
NULL
,
$edit
,
t
(
'Send
message
'
));
$this
->
assertText
(
t
(
'
Your
message has been sent.'
),
t
(
'Message sent.'
));
}
// Submit contact form one over limit.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment