From 5eee6880af28a7960de27639468da0c2ec425901 Mon Sep 17 00:00:00 2001
From: Danny Gershman <dgershman@securityscorecard.io>
Date: Fri, 3 Aug 2018 01:22:01 -0400
Subject: [PATCH] fix for #19 + bumping next release

---
 bmlt-meeting-list.php | 8 ++++----
 readme.txt            | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bmlt-meeting-list.php b/bmlt-meeting-list.php
index 9c1e1ab..8c86549 100644
--- a/bmlt-meeting-list.php
+++ b/bmlt-meeting-list.php
@@ -3,7 +3,7 @@
 Plugin Name: bread
 Plugin URI: http://wordpress.org/extend/plugins/bread/
 Description: Maintains and generates a PDF Meeting List from BMLT. 
-Version: 1.4.0
+Version: 1.5.0
 */
 /* Disallow direct access to the plugin file */
 use Mpdf\Mpdf;
@@ -18,7 +18,7 @@
 	class Bread {
 		var $lang = '';
 		
-		var $version = '1.4.0';
+		var $version = '1.5.0';
 		var $mpdf = '';
 		var $meeting_count = 0;
 		var $formats_used = '';
@@ -820,7 +820,7 @@ function bmlt_meeting_list($atts = null, $content = null) {
 				if ( $this->options['meeting_sort'] === 'state' ) {
 					$unique_data[] = $value['location_municipality'] . ', '.$value['location_province'];
 				} elseif ( $this->options['meeting_sort'] === 'city' ) {
-					$unique_data[] = $value['location_municipality'];
+					$unique_data[] = strtoupper($value['location_municipality']);
 				} elseif ( $this->options['meeting_sort'] === 'borough' ) {
 					$unique_data[] = $value['location_city_subsection'];
 				} elseif ( $this->options['meeting_sort'] === 'county' ) {
@@ -938,7 +938,7 @@ function bmlt_meeting_list($atts = null, $content = null) {
 						}
 						if ( $this->options['meeting_sort'] === 'state' && $meeting_value['location_municipality'] . ', ' . $meeting_value['location_province'] !== $this_unique_value ) { continue; }
 						if ( $this->options['meeting_sort'] === 'group' && $meeting_value['meeting_name'] !== $this_unique_value ) { continue; }
-						if ( $this->options['meeting_sort'] === 'city' && $meeting_value['location_municipality'] !== $this_unique_value ) { continue; }
+						if ( $this->options['meeting_sort'] === 'city' && strtoupper($meeting_value['location_municipality']) !== $this_unique_value ) { continue; }
 						if ( $this->options['meeting_sort'] === 'borough' && $meeting_value['location_city_subsection'] !== $this_unique_value ) { continue; }
 						if ( $this->options['meeting_sort'] === 'county' && $meeting_value['location_sub_province'] !== $this_unique_value ) { continue; }
 						if ( $this->options['meeting_sort'] === 'borough_county' ) {
diff --git a/readme.txt b/readme.txt
index 54e95ba..c3f4c17 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,8 +4,8 @@ Contributors: odathp, radius314, pjaudiomv, klgrimley
 Tags: meeting list, bmlt, narcotics anonymous, na
 Requires at least: 4.0
 Requires PHP: 5.6
-Tested up to: 4.9.6
-Stable tag: 1.4.0
+Tested up to: 4.9.7
+Stable tag: 1.4.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 A web-based tool that creates, maintains and generates a PDF meeting list from BMLT.
@@ -55,8 +55,11 @@ Follow all these steps, keep in mind that once you start using bread, it's not g
 == Changelog ==
 
 = 1.5.0 =
+* Upgraded to mPDF 7.1.1
 * Added recurse service bodies option for zones and metros
-* Bug fixes for base font selection
+* Bug fixes for base font selection and some formatting issues
+* Remove duplicate formats that can occur with Tomato
+* Keep city headers grouped together if casing doesn't match (won't fix sorting issues).
 
 = 1.4.0 =
 * Support for PHP 7.1 and up