[freeside-commits] branch FREESIDE_4_BRANCH updated. 18c201ad378d85e4a60206e33d3f257af2598b21

[Ivan Kohler]

The branch, FREESIDE_4_BRANCH has been updated
       via  18c201ad378d85e4a60206e33d3f257af2598b21 (commit)
      from  d33ff2da7cb349a12d98d4560dab3e68a4c8f5dc (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 18c201ad378d85e4a60206e33d3f257af2598b21
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 10 16:41:27 2018 -0800

    fix direct use of customer_view_emails pref, RT#78617

diff --git a/httemplate/view/cust_main/notes/email.html b/httemplate/view/cust_main/notes/email.html
index 41c5b8ad4..9e217e4f0 100644
--- a/httemplate/view/cust_main/notes/email.html
+++ b/httemplate/view/cust_main/notes/email.html
@@ -61,7 +61,10 @@ my $cust_main = $opt{'cust_main'}
 my $custnum = $cust_main->custnum;
 
 my $where = "WHERE cust_msg.custnum = $custnum";
-my $maxrecords = $curuser->option('customer_view_emails') || 10;
+my $maxrecords = 10;
+if ( $curuser->option('customer_view_emails') =~ /^\s*(\d+)\s*$/ ) {
+  $maxrecords = $1;
+}
 
 my $order_by = '_date DESC';
 

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

Summary of changes:
 httemplate/view/cust_main/notes/email.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)