[freeside-commits] branch FREESIDE_4_BRANCH updated. 37a37bc1146a9ac2dfe6502c1c9f0d211a9a9209

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  37a37bc1146a9ac2dfe6502c1c9f0d211a9a9209 (commit)
      from  e6179f8b8d8624620742c60ef3b831a9c531bc2b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 37a37bc1146a9ac2dfe6502c1c9f0d211a9a9209
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Sep 28 15:08:53 2016 -0500

    72456: Directions - override company_address [context bug fix]

diff --git a/httemplate/elements/coord-links.html b/httemplate/elements/coord-links.html
index 586a710..db04dad 100644
--- a/httemplate/elements/coord-links.html
+++ b/httemplate/elements/coord-links.html
@@ -51,8 +51,9 @@ my $apikey = $conf->config('google_maps_api_key');
 #for directions link
 my @origin = $opt{company_address}
                ? @{ $opt{company_address} }
-               : ( $conf->config('company_physical_address', $agentnum) ||
-                   $conf->config('company_address', $agentnum) );
+               : ( $conf->config('company_physical_address', $agentnum) 
+                   ? $conf->config('company_physical_address', $agentnum)
+                   : $conf->config('company_address', $agentnum) );
 my $origin = uri_escape(join(',', @origin));
 
 </%init>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/coord-links.html |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)