Merge branch 'master' into Gutenberg/master

eventespresso · Apr 24, 2018 · f1f1710 · f1f1710
2 parents d0e3e02 + 38569d8
commit f1f1710
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/espresso.php b/espresso.php
@@ -3,7 +3,7 @@
   Plugin Name:		Event Espresso
   Plugin URI:  		http://eventespresso.com/pricing/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=wordpress_plugins_page&utm_content=support_link
   Description: 		Manage events, sell tickets, and receive payments from your WordPress website. Reduce event administration time, cut-out ticketing fees, and own your customer data. | <a href="https://eventespresso.com/add-ons/?utm_source=plugin_activation_screen&utm_medium=link&utm_campaign=plugin_description">Extensions</a> | <a href="https://eventespresso.com/pricing/?utm_source=plugin_activation_screen&utm_medium=link&utm_campaign=plugin_description">Sales</a> | <a href="admin.php?page=espresso_support">Support</a>
-  Version:			4.9.62.rc.021
+  Version:			4.9.62.rc.023
   Author:			Event Espresso
   Author URI: 		http://eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=wordpress_plugins_page&utm_content=support_link
   License: 		     GPLv2
@@ -102,7 +102,7 @@ function espresso_minimum_php_version_error()
          */
         function espresso_version()
         {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.62.rc.021');
+            return apply_filters('FHEE__espresso__espresso_version', '4.9.62.rc.023');
         }
 
         /**

diff --git a/modules/ical/EED_Ical.module.php b/modules/ical/EED_Ical.module.php
@@ -196,19 +196,19 @@ public static function download_ics_file() {
 				header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); // past date
 				ini_set( 'zlib.output_compression', '0' );
 				// echo the output
-				echo "BEGIN:VCALENDAR" . PHP_EOL;
-				echo "VERSION:2.0" . PHP_EOL;
-				echo "PRODID:-//{$organizer_name}//NONSGML PDA Calendar Version 1.0//EN" . PHP_EOL;
-				echo "CALSCALE:GREGORIAN" . PHP_EOL;
-				echo "BEGIN:VEVENT" . PHP_EOL;
+				echo "BEGIN:VCALENDAR\r\n";
+				echo "VERSION:2.0\r\n";
+				echo "PRODID:-//{$organizer_name}//NONSGML PDA Calendar Version 1.0//EN\r\n";
+				echo "CALSCALE:GREGORIAN\r\n";
+				echo "BEGIN:VEVENT\r\n";
 
 				//Output all remaining values from ics_data.
 				foreach( $ics_data as $key => $value ) {
-					echo $key . ':' . $value . PHP_EOL;
+					echo $key . ':' . $value . "\r\n";
 				}
 
-				echo "END:VEVENT" . PHP_EOL;
-				echo "END:VCALENDAR" . PHP_EOL;
+				echo "END:VEVENT\r\n";
+				echo "END:VCALENDAR\r\n";
 			}
 		}
 		die();