Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
einsteinathome
boinc
Commits
a27cffc1
Commit
a27cffc1
authored
Oct 14, 2015
by
Rom Walton
Browse files
Merge pull request #1406 from BOINC/rename_recaptcha
Web: rename recaptcha_get_html() because of a conflict with Drupal
parents
80f5187e
72bec238
Changes
3
Hide whitespace changes
Inline
Side-by-side
html/inc/account.inc
View file @
a27cffc1
...
...
@@ -78,7 +78,7 @@ function create_account_form($teamid, $next_url) {
if
(
$publickey
)
{
row2
(
""
,
recaptcha_get_html
(
$publickey
)
boinc_
recaptcha_get_html
(
$publickey
)
);
}
...
...
html/inc/util.inc
View file @
a27cffc1
...
...
@@ -1002,7 +1002,7 @@ function recaptcha_get_head_extra() {
}
}
function
recaptcha_get_html
(
$publickey
)
{
function
boinc_
recaptcha_get_html
(
$publickey
)
{
if
(
$publickey
)
{
return
'<div class="g-recaptcha" data-sitekey="'
.
$publickey
.
'"></div>'
;
}
else
{
...
...
html/user/create_profile.php
View file @
a27cffc1
...
...
@@ -107,7 +107,7 @@ function show_submit() {
$config
=
get_config
();
$publickey
=
parse_config
(
$config
,
"<recaptcha_public_key>"
);
if
(
$publickey
)
{
table_row
(
recaptcha_get_html
(
$publickey
));
table_row
(
boinc_
recaptcha_get_html
(
$publickey
));
}
table_row
(
"<p><input class=
\"
btn btn-primary
\"
type=
\"
submit
\"
value=
\"
"
.
tra
(
"Create/edit profile"
)
.
"
\"
name=
\"
submit
\"
>"
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment