From 72bec2388a419e1115a0eb5914f1fb1df82a70f7 Mon Sep 17 00:00:00 2001
From: Christian Beer <chbeer@HNB544.aei.uni-hannover.de>
Date: Wed, 14 Oct 2015 12:10:06 +0200
Subject: [PATCH] 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.
---
 html/inc/account.inc         | 2 +-
 html/inc/util.inc            | 2 +-
 html/user/create_profile.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/inc/account.inc b/html/inc/account.inc
index 3dea844d9d..93825f8362 100644
--- a/html/inc/account.inc
+++ b/html/inc/account.inc
@@ -78,7 +78,7 @@ function create_account_form($teamid, $next_url) {
     if ($publickey) {
         row2(
             "",
-            recaptcha_get_html($publickey)
+            boinc_recaptcha_get_html($publickey)
         );
     }
 
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 6bb901f237..9e5d55abaa 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -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 {
diff --git a/html/user/create_profile.php b/html/user/create_profile.php
index 5cdb766928..9d2d4d69f4 100644
--- a/html/user/create_profile.php
+++ b/html/user/create_profile.php
@@ -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\">");
 }