Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Web: rename recaptcha_get_html() because of a conflict with Drupal 

When also including an older recaptchalib.php this function gets redefined. Since it is only a wrapper function and only used within BOINC, renaming it is safe.
This commit is contained in:
Christian Beer 2015-10-14 12:10:06 +02:00
parent 2495f76bc6
commit 72bec2388a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/inc/account.inc
View File

@ -78,7 +78,7 @@ function create_account_form($teamid, $next_url) {
if ($publickey) {
row2(
"",
recaptcha_get_html($publickey)
boinc_recaptcha_get_html($publickey)
);
}

2
html/inc/util.inc
View File

@ -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 {

2
html/user/create_profile.php
View File

@ -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\">");
}