summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authormark <mark>2011-04-30 21:20:50 +0000
committermark <mark>2011-04-30 21:20:50 +0000
commit41d0660124cf3965a4a2b4706d02e382ac4cbf01 (patch)
treec8d68353d466eebf37ff7d4f4564f3d20ac0b91d /httemplate
parent948efea2aa4d4eb05e3d8f6f5402b3bf825759bf (diff)
better error handling in google export, #12064
Diffstat (limited to 'httemplate')
-rwxr-xr-xhttemplate/edit/svc_acct.cgi10
1 files changed, 9 insertions, 1 deletions
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 2eb4a8b86..f2b8e0c4a 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -494,7 +494,15 @@ sub max {
my $captcha_url;
my ($export_google) = $part_svc->part_export('acct_google');
if ( $export_google ) {
- $captcha_url = $export_google->captcha_url || '';
+ my $error = $export_google->auth_error;
+ if ( $error ) {
+ if ( $error->{'captcha_url'} ) {
+ $captcha_url = $error->{'captcha_url'};
+ }
+ else {
+ $cgi->param('error', $error->{'message'});
+ }
+ } #if $error
}
</%init>