Version 4.3.0

applications/core/setup/upg_100003/upgrade.php

@@ -82,6 +82,15 @@ class _Upgrade
 
 			$did++;
 
+			/* Make sure the users aren't orphaned */
+			$requester = \IPS\Member::load( $friend['friends_friend_id'] );
+			$requestee = \IPS\Member::load( $friend['friends_member_id'] );
+
+			if( !$requestee->member_id OR !$requester->member_id )
+			{
+				continue;
+			}
+
 			/* Follower */
 			$follower	= array(
 				'follow_id'				=> md5( 'core;member;' . $friend['friends_friend_id'] . ';' . $friend['friends_member_id'] ),
@@ -152,8 +161,7 @@ class _Upgrade
 	{
 		if ( \IPS\Db::i()->select( 'COUNT(*)', 'core_advertisements', 'ad_active=1' )->first() )
 		{
-			\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => 1 ), array( 'conf_key=?', 'ads_exist' ) );
-			unset( \IPS\Data\Store::i()->settings );
+			\IPS\Settings::i()->changeValues( array( 'ads_exist' => 1 ) );
 		}
 
 		return true;
@@ -228,11 +236,6 @@ class _Upgrade
 			$memberCleanup[]	= "CHANGE COLUMN last_post member_last_post INT(10) null DEFAULT null";
 		}
 
-		if( !\IPS\Db::i()->checkForIndex( 'core_members', 'ipsconnect_id' ) )
-		{
-			$memberCleanup[]	= "ADD INDEX ipsconnect_id (ipsconnect_id)";
-		}
-
 		if( count( $memberCleanup ) )
 		{
 			$toRun = \IPS\core\Setup\Upgrade::runManualQueries( array( array(