Merge pull request #97 from bmlt-enabled/fix-column-seperators-on-tab…

…loid Fix column separators and upgrade issue with subheaders
bmlt-enabled · Jul 31, 2019 · fde861f · fde861f
2 parents 847338e + 4ba0726
commit fde861f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/bmlt-meeting-list.php b/bmlt-meeting-list.php
@@ -735,6 +735,9 @@ function bmlt_meeting_list($atts = null, $content = null) {
 					}
 					$this->options['page_orientation'] = 'L';
 				}
+				if (substr($this->options['meeting_sort'],0,8) == 'weekday_') {
+						$this->options['sub_header_shown'] = true;
+				}
 			}
 			// TODO: The page number is always 5 from botton...this should be adjustable
 			if ( $this->options['page_fold'] == 'half')  {
@@ -825,8 +828,8 @@ function bmlt_meeting_list($atts = null, $content = null) {
 					'margin_header' => $this->options['margin_header'],
 				];
             }
-   
-            $this->mpdf = new mPDF(array_merge($mpdf_init_options, $page_type_settings));
+			$mpdf_init_options = array_merge($mpdf_init_options, $page_type_settings);
+            $this->mpdf = new mPDF($mpdf_init_options);
             $this->mpdf->setAutoBottomMargin = 'pad';
 
             // TODO: Adding a page number really could just be an option or tag.
@@ -877,7 +880,7 @@ function bmlt_meeting_list($atts = null, $content = null) {
 				$this->mpdf_column=new mPDF([
                     'mode' => $mode,
                     'tempDir' => get_temp_dir(),
-                    'format' => $this->options['page_size']."-".$this->options['page_orientation'],
+                    'format' => $mpdf_init_options['format'],
                     'default_font_size' => 7,
                     'default_font' => $default_font,
                     'margin_left' => $this->options['margin_left'],