Version 4.1.2

applications/calendar/setup/upg_32000/queries.php

@@ -107,6 +107,3 @@ $SQL[] = "INSERT INTO cal_events SELECT event_id, event_calendar_id, event_membe
 event_recurring, FROM_UNIXTIME(event_unix_from), CASE WHEN event_unix_to > 0 THEN FROM_UNIXTIME(event_unix_to) ELSE NULL END, '', 0, 0, 0, 0, MD5( CONCAT( event_id, event_title ) ), 0, 1 FROM " . \IPS\Db::i()->prefix . "cal_events_bak;";
 
 $SQL[] = "DROP TABLE cal_events_bak;";
-
-$SQL[] = "ALTER TABLE cal_events ADD event_all_day TINYINT NOT NULL DEFAULT '0';";
-$SQL[] = "UPDATE cal_events SET event_all_day=1 WHERE TIME(event_start_date) = '00:00:00';";

applications/calendar/setup/upg_32005/queries.php

@@ -0,0 +1,4 @@
+<?php
+
+$SQL[] = "ALTER TABLE cal_events ADD event_all_day TINYINT NOT NULL DEFAULT '0';";
+$SQL[] = "UPDATE cal_events SET event_all_day=1 WHERE TIME(event_start_date) = '00:00:00';";

applications/calendar/setup/upg_32005/upgrade.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * @brief		4.0.0 Upgrade Code
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Social Suite
+ * @subpackage	Calendar
+ * @since		8 October 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\calendar\setup\upg_32005;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * 4.0.0 Upgrade Code
+ */
+class _Upgrade
+{
+	/**
+	 * Conversion from 3.0
+	 *
+	 * @return	array	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
+	 */
+	public function step1()
+	{
+		\IPS\core\Setup\Upgrade::runLegacySql( 'calendar', 32005 );
+		
+		return TRUE;
+	}
+}

applications/calendar/setup/upg_40000/upgrade.php

@@ -65,7 +65,7 @@ class _Upgrade
 	{
 		foreach( \IPS\Db::i()->select( '*', 'calendar_calendars' ) as $calendar )
 		{
-			\IPS\Lang::saveCustom( 'calendar', "calendar_calendar_{$calendar['cal_id']}", html_entity_decode( $calendar['cal_title'], ENT_QUOTES, 'UTF-8' ) );
+			\IPS\Lang::saveCustom( 'calendar', "calendar_calendar_{$calendar['cal_id']}", \IPS\Text\Parser::utf8mb4SafeDecode( $calendar['cal_title'] ) );
 		}
 
 		\IPS\Db::i()->dropColumn( 'calendar_calendars', 'cal_title' );