Version 4.1.19

applications/cms/setup/upg_100041/upgrade.php

@@ -2,9 +2,10 @@
 /**
  * @brief		4.0.11 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
+ * @subpackage	Content
  * @since		14 Jul 2015
  * @version		SVN_VERSION_NUMBER
  */
@@ -33,6 +34,13 @@ class _Upgrade
 		foreach ( \IPS\Db::i()->select( '*', 'cms_blocks', array( 'block_type=?', 'plugin' ) ) as $block )
 		{
 			$config = json_decode( $block['block_plugin_config'], TRUE );
+
+			/* Some badly stored blocks may have corrupt config...we'll just switch to an array to prevent errors in the upgrade */
+			if( !is_array( $config ) )
+			{
+				$config = array();
+			}
+
 			$update = FALSE;
 			
 			if ( $block['block_plugin'] == 'latestTopics' )