From 47fc30a4f3961e2bdc90dbd2c2a2389ef3ef3663 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 26 Mar 2011 00:10:06 +0000 Subject: [PATCH] fix export-less DID selection, RT#12178 --- httemplate/elements/select-did.html | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/httemplate/elements/select-did.html b/httemplate/elements/select-did.html index dd2e8e531..17eac4850 100644 --- a/httemplate/elements/select-did.html +++ b/httemplate/elements/select-did.html @@ -113,17 +113,16 @@ my @exports = $part_svc->part_export_did; if ( scalar(@exports) > 1 ) { die "more than one DID-providing export attached to svcpart $svcpart"; } +my $export = '' +$export = $exports[0] if scalar(@exports); my $use_selector = scalar(@exports) ? 1 : 0; -my $export; -$export = $exports[0] if scalar(@exports); - my $bulknum = $opt{'bulknum'} || 0; -my $country = $export->option('country') || - $conf->config('countrydefault') || - 'US'; +my $country = ( $export && $export->option('country') ) + || $conf->config('countrydefault') + || 'US'; #my $field = $opt{'field'} || 'phonenum'; -- 2.11.0